Fix a bunch of mapping issues