Fix order bugs.