more findbugs changes