diff --git a/qml/Key.qml b/qml/Key.qml
index a144cc6..19f6cb4 100644
--- a/qml/Key.qml
+++ b/qml/Key.qml
@@ -161,7 +161,7 @@ Rectangle {
         keyRepeatStarter.stop();
         keyRepeatTimer.stop();
         key.color = keyboard.keyBgColor;
-        keyboard.currentKeyPressed = 0;
+        keyboard.currentKeyPressed = null;
 
         if (sticky && !becomesSticky) {
             keyboard.keyModifiers &= ~code
@@ -184,7 +184,7 @@ Rectangle {
             }
 
             // first non-sticky press will cause the sticky to be released
-            if( !sticky && keyboard.resetSticky != 0 && keyboard.resetSticky !== key ) {
+            if( !sticky && keyboard.resetSticky && keyboard.resetSticky !== key ) {
                 resetSticky.setStickiness(0);
             }
         }
@@ -211,7 +211,7 @@ Rectangle {
     function setStickiness(val)
     {
         if(sticky) {
-            if( keyboard.resetSticky != 0 && keyboard.resetSticky !== key ) {
+            if( keyboard.resetSticky && keyboard.resetSticky !== key ) {
                 resetSticky.setStickiness(0)
             }
 
@@ -230,7 +230,7 @@ Rectangle {
                 keyboard.keyModifiers &= ~code
             }
 
-            keyboard.resetSticky = 0
+            keyboard.resetSticky = null
 
             if(stickiness==1) {
                 stickIndicator.anchors.topMargin = key.height/2
diff --git a/qml/Keyboard.qml b/qml/Keyboard.qml
index fbc59c2..c84c2af 100644
--- a/qml/Keyboard.qml
+++ b/qml/Keyboard.qml
@@ -23,9 +23,9 @@ Item {
     id: keyboard
 
     property int keyModifiers
-    property var resetSticky: 0
-    property var currentStickyPressed: null
-    property var currentKeyPressed: 0
+    property Key resetSticky
+    property Key currentStickyPressed
+    property Key currentKeyPressed
 
     property string keyFgColor: "#ffffff"
     property string keyBgColor: "#202020"
@@ -86,7 +86,7 @@ Item {
     }
 
     onCurrentKeyPressedChanged: {
-        if(currentKeyPressed != 0 && currentKeyPressed.currentLabel.length === 1 && currentKeyPressed.currentLabel !== " ") {
+        if(currentKeyPressed && currentKeyPressed.currentLabel.length === 1 && currentKeyPressed.currentLabel !== " ") {
             visualKeyFeedbackRect.label = currentKeyPressed.currentLabel
             visualKeyFeedbackRect.width = currentKeyPressed.width*1.5
             visualKeyFeedbackRect.height = currentKeyPressed.height*1.5