Additional command fixes noticed by Helen