Fix these goofy out of order issues