Add fixes for ChangeType