Small variable order fixes