Updates from Findbugs inspection, and also a test commit