Fixes #2759, checkstyle issues