Fixed up the command bindings