Fix various findbugs static code analysis suggestions