Fix findbugs high priority errors