More FindBugs / IntelliJ inspection changes