findbugs fixes and suppressions