Fix some checkstyle issues