fix findbugs issues
fix findbugs issues