Fixing user commands