Fixing build after Sync