diff --git a/examples/cva-input.c b/examples/cva-input.c
index e690755..5a721fd 100644
--- a/examples/cva-input.c
+++ b/examples/cva-input.c
@@ -122,19 +122,19 @@ int main( int argc, char** argv )
 				cvaPoint returnPoint;
 				returnPoint = xte_commandString( display, optarg, mouseButton, searchMethod, tolerance, timeout );
 
-				if (returnPoint.x != -1 && returnPoint.y != -1)
-				{
-					printf("%s%s%i%s%i\n", optarg, separator, returnPoint.x, separator, returnPoint.y);
-					returnCode = 0;
-				}
-
-				else if (returnPoint.x == -2 && returnPoint.y == -2)
+				if (returnPoint.x == -2 && returnPoint.y == -2)
 				{
 					/* Not an error, just that the command didn't use returnPoint */
 					printf("%s\n", optarg);
 					returnCode = 0;
 				}
 
+				else if (returnPoint.x != -1 && returnPoint.y != -1)
+				{
+					printf("%s%s%i%s%i\n", optarg, separator, returnPoint.x, separator, returnPoint.y);
+					returnCode = 0;
+				}
+
 				break;
 
 			case 'o':
diff --git a/libcvautomation_funcs b/libcvautomation_funcs
index 0875b5c..16e9bec 100644
--- a/libcvautomation_funcs
+++ b/libcvautomation_funcs
@@ -641,10 +641,10 @@ key_str ()
 		return 255
 	fi
 
-	COMMAND_LINE="-s 'keystring $*' "
+	COMMAND_LINE="-s 'keystring $*'"
 
 	out "key_str: \"$*\""
-	eval '$CVAINPUT $COMMAND_LINE >> $OUTFILE'
+	eval "$CVAINPUT $COMMAND_LINE >> $OUTFILE"
 
 	return $?
 }	# ----------  end of function key_str  ----------
@@ -665,7 +665,7 @@ key_down ()
 
 	out "key_down: $1"
 
-	eval '$CVAINPUT -s "keydown $1" >> $OUTFILE'
+	eval "$CVAINPUT -s 'keydown $1' >> $OUTFILE"
 
 	return $?
 }	# ----------  end of function key_down  ----------
@@ -685,7 +685,7 @@ key_up ()
 
 	out "key_up: $1"
 
-	eval '$CVAINPUT -s "keyup $1" >> $OUTFILE'
+	eval "$CVAINPUT -s 'keyup $1' >> $OUTFILE"
 
 	return $?
 }	# ----------  end of function key_up  ----------
@@ -705,7 +705,7 @@ key_click ()
 
 	out "key_click: $1"
 	
-	eval '$CVAINPUT -s "keyclick $1" >> $OUTFILE'
+	eval "$CVAINPUT -s 'keyclick $1' >> $OUTFILE"
 	
 	return $?
 }	# ----------  end of function key_press  ----------