checkstyle fixes for config