findbugs: minor fixes