Some minor fixing (commutativity)