Determinism fixes to automatic axis assignments