FindBugs fixes/cleanup

Good news, nothing from find-security-bugs