More mapping corrections