Address FindBugs warnings

@nacx Can you investigate this?