Fix some findbugs warnings