32x: some mapping corrections