Fixed bugs in shorthand commands