more checkstyle patches