Changing ExtendedID to Int16 consistently