Merge "Fixing findbugs"