Fix some ordering weirdness