Some checkstyle fixes