More UDA order fixes