Suppress findbugs warnings

Fix 2 more findbugs warnings and suppress the rest.