Suppress some more findbugs warnings