fix findbugs issues