Misc checkstyle fixes