Fixed Findbugs errors