A few fixes suggested by Findbugs