Checkstyle and findbugs fixes