fix high priority findbugs warnings