Fix more warnings/issues found by FindBugs