Fix some issues found with Findbugs