Fixed some Findbugs issues