More aggressive Findbugs analysis fixes