Suppress findbugs warnings

Fix 2 more findbugs warnings and suppress the rest. The story can be closed after this change.