Fix a few findbugs violations