Checkstyle fixes/ignores