Small updates to reflect recent command changes