Merge "Fix errors caused by unused variables"