Fix issues identified by Findbugs