fix some findbugs findings