fix findbugs warnings pt. 2