DO NOT MERGE: Findbugs fixes