Cleans up some more FindBugs warnings