client order fixes