Merge "Fixing the build"