Fixed general issues in CommandHandler