Few command improvements