Fix build/checkstyle failures