diff --git a/onetouch_aq_programmer.c b/onetouch_aq_programmer.c
index 54d2ad5..15608ce 100644
--- a/onetouch_aq_programmer.c
+++ b/onetouch_aq_programmer.c
@@ -644,7 +644,7 @@ void set_aqualink_onetouch_heater_setpoint( struct aqualinkdata *aq_data, bool i
   int i;
   int len;
   //char *st;
-  unsigned char direction;
+  unsigned char direction = KEY_ONET_UP;
 
   if ( !goto_onetouch_menu(aq_data, OTM_SET_TEMP) ){
     LOG(ONET_LOG,LOG_ERR, "OneTouch device programmer failed to get heater temp menu\n");
diff --git a/pda_aq_programmer.c b/pda_aq_programmer.c
index e2c6003..33464cf 100644
--- a/pda_aq_programmer.c
+++ b/pda_aq_programmer.c
@@ -934,23 +934,23 @@ bool set_PDA_numeric_field_value(struct aqualinkdata *aq_data, int val, int cur_
   }
 
   if (cur_val == -1) {
-    char *hghlight_chars;
-    int hlight_length=0;
+    char *hghlight_chars = NULL;
+    int hlight_length = 0;
     int i=0;
     hghlight_chars = pda_m_hlightchars(&hlight_length); // NSF May need to take this out and there for the LOG entry after while
     while (hlight_length >= 15 || hlight_length <= 0) {
-      delay(500);
+      //delay(500);
       waitForPDANextMessageType(aq_data,CMD_PDA_HIGHLIGHTCHARS, 1, 0);
       hghlight_chars = pda_m_hlightchars(&hlight_length);
-      LOG(PDA_LOG,LOG_DEBUG, "Numeric selector, highlight chars '%.*s'\n",hlight_length , hghlight_chars);
+      LOG(PDA_LOG,LOG_DEBUG, "Numeric selector, highlight chars '%.*s'\n", hlight_length, hghlight_chars);
       if (++i >= 20) {
-        LOG(PDA_LOG,LOG_ERR, "Numeric selector, didn't find highlight chars, current selection is '%.*s'\n",hlight_length , hghlight_chars);
+        LOG(PDA_LOG,LOG_ERR, "Numeric selector, didn't find highlight chars, current selection is '%.*s'\n", hlight_length, hghlight_chars);
         return false;
       }
     }
 
     cur_val = atoi(hghlight_chars);
-    LOG(PDA_LOG,LOG_DEBUG, "Numeric selector, highlight chars '%.*s', numeric value using %d\n",hlight_length , hghlight_chars, cur_val);
+    LOG(PDA_LOG,LOG_DEBUG, "Numeric selector, highlight chars '%.*s', numeric value using %d\n", hlight_length, hghlight_chars, cur_val);
   }
 
   if (val < cur_val) {