3 files changed, 11 insertions, 5 deletions
diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp
index bd8431b31..003cd4a5d 100644
--- a/src/actions/actions.cpp
+++ b/src/actions/actions.cpp
@@ -567,7 +567,7 @@ impHandler0(copyEquippedToOutfit)
     return false;
 }
 
-impHandler0(pickup)
+impHandler(pickup)
 {
     if (!localPlayer)
         return false;
@@ -653,7 +653,7 @@ impHandler(sell)
     return false;
 }
 
-impHandler0(talk)
+impHandler(talk)
 {
     Being *being = findBeing(event.args);
     if (!being)
diff --git a/src/actions/chat.cpp b/src/actions/chat.cpp
index b074fc9ff..5891243b3 100644
--- a/src/actions/chat.cpp
+++ b/src/actions/chat.cpp
@@ -450,7 +450,7 @@ impHandler(kickParty)
     return true;
 }
 
-impHandler0(addText)
+impHandler(addText)
 {
     if (chatWindow)
         chatWindow->addInputText(event.args);
diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp
index b90a801d1..d2155d54b 100644
--- a/src/actions/commands.cpp
+++ b/src/actions/commands.cpp
@@ -22,7 +22,6 @@
 
 #include "actormanager.h"
 #include "configuration.h"
-#include "flooritem.h"
 #include "game.h"
 #include "inventory.h"
 #include "item.h"
@@ -494,11 +493,18 @@ impHandler(imitation)
         return false;
 
     if (!event.args.empty())
+    {
         localPlayer->setImitate(event.args);
+    }
     else if (event.tab && event.tab->getType() == ChatTabType::WHISPER)
-        localPlayer->setImitate(static_cast<WhisperTab*>(event.tab)->getNick());
+    {
+        localPlayer->setImitate(static_cast<WhisperTab*>(
+            event.tab)->getNick());
+    }
     else
+    {
         localPlayer->setImitate("");
+    }
     return true;
 }