Cleaning up findbugs errors