Many commutation fixes