Additional minor fix to command completion