more findbugs stuff