Some more checkstyle fixes