Working around findbugs / checkstyle issues