Fixed up some Findbugs issues