Fix some remaining problems from trying to add instance data to the data alter field...