Library Findbugs fixes