I think these are important Findbugs fixes.