Fix assorted command handlers.
Fix missing conversation log message.
Merge branch 'feature/issue-318-fix-command-handlers' into develop