Fix high priority FindBugs warnings