diff --git a/platypush/plugins/media/chromecast.py b/platypush/plugins/media/chromecast.py
index 1f8a1a5c7..44c527be7 100644
--- a/platypush/plugins/media/chromecast.py
+++ b/platypush/plugins/media/chromecast.py
@@ -221,7 +221,7 @@ class MediaChromecastPlugin(MediaPlugin):
         cast = self.get_chromecast(chromecast or self.chromecast)
         if cast.media_controller.is_paused:
             return cast.media_controller.play()
-        else:
+        elif cast.media_controller.is_playing:
             return cast.media_controller.pause()
 
 
diff --git a/platypush/plugins/media/kodi.py b/platypush/plugins/media/kodi.py
index df5471fa7..0256da829 100644
--- a/platypush/plugins/media/kodi.py
+++ b/platypush/plugins/media/kodi.py
@@ -225,7 +225,7 @@ class MediaKodiPlugin(Plugin):
         return (result.get('result'), result.get('error'))
 
     @action
-    def toggle_mute(self, *args, **kwargs):
+    def mute(self, *args, **kwargs):
         """
         Mute/unmute the application
         """
@@ -318,7 +318,7 @@ class MediaKodiPlugin(Plugin):
         return (result.get('result'), result.get('error'))
 
     @action
-    def toggle_fullscreen(self, *args, **kwargs):
+    def fullscreen(self, *args, **kwargs):
         """
         Set/unset fullscreen mode
         """
@@ -330,7 +330,7 @@ class MediaKodiPlugin(Plugin):
         return (result.get('result'), result.get('error'))
 
     @action
-    def toggle_shuffle(self, player_id=None, shuffle=None, *args, **kwargs):
+    def shuffle(self, player_id=None, shuffle=None, *args, **kwargs):
         """
         Set/unset shuffle mode
         """
@@ -348,7 +348,7 @@ class MediaKodiPlugin(Plugin):
         return (result.get('result'), result.get('error'))
 
     @action
-    def toggle_repeat(self, player_id=None, repeat=None, *args, **kwargs):
+    def repeat(self, player_id=None, repeat=None, *args, **kwargs):
         """
         Set/unset repeat mode
         """