Fixes to ensure the ultimate run list order is good