Command improvements.