Fixing findbugs