Make some changes to the emitted datatypes