Fix some checkstyles issues