[OSX] Mapping interface updates.