Fix more checkstyles issues