findbugs warning fixes