Small checkstyle fixes