Merge "Findbugs cleanup"