Fix some more checkstyle warnings