fix findbugs warnings
fix findbugs warnings