Various command improvements