Fix some Findbugs warnings