Merge "Fixing build"