Fixing master sync changes