Fixing up stuff from Findbugs report