findbugs down to a-s fixed