Remove some mapping conlicts