Command template corrections