Various checkstyle fixes