Fixed more glitches regarding order modification

Fixed a couple more exotic glitches regarding special order modification
cases.