Fix pass order heuristic
Cosmetics