Fix some mapping stuff