Fixing findbugs issues