Fixing more checkstyle and findbugs.