more findbugs tweaks