Fixes for checkstyle.