fix various findbugs warnings