diff --git a/libraries/simplepie/simplepie.inc b/libraries/simplepie/simplepie.inc
old mode 100644
new mode 100755
index 9e4fa30..33b3ada
--- a/libraries/simplepie/simplepie.inc
+++ b/libraries/simplepie/simplepie.inc
@@ -12151,7 +12151,7 @@ class SimplePie_IRI
 		}
 		else
 		{
-			$this->query = $this->replace_invalid_with_pct_encoding($query, 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~!$\'()*+,;:@/?');
+			$this->query = $this->replace_invalid_with_pct_encoding($query, 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~!$&\'()*+,;=:@/?');
 		}
 		$this->valid[__FUNCTION__] = true;
 		return true;
diff --git a/modules/clock/clock.module b/modules/clock/clock.module
old mode 100755
new mode 100644
index ecbb519..5beb68a
--- a/modules/clock/clock.module
+++ b/modules/clock/clock.module
@@ -210,7 +210,12 @@ function _clock_get_date_format() {
   $date_type = variable_get('clock_date_type', 'long');
   // Each date format type has a corresponding variable. If it is not set, get
   // the list of date formats for that type and use the first one.
-  $date_format = variable_get('date_format_' . $date_type, key(system_get_date_formats($date_type)));
+  if (in_array($date_type, array('long', 'medium', 'short'))) {
+    $default_format = key(system_get_date_formats($date_type));
+  } else {
+    $default_format = key(system_get_date_formats('custom'));
+  }
+  $date_format = variable_get('date_format_' . $date_type, $default_format);
   return $date_format;
 }
 
diff --git a/modules/gcal_events/LICENSE.txt b/modules/gcal_events/LICENSE.txt
old mode 100644
new mode 100755
diff --git a/modules/gcal_events/README.txt b/modules/gcal_events/README.txt
old mode 100644
new mode 100755
diff --git a/modules/gcal_events/gcal_events.css b/modules/gcal_events/gcal_events.css
old mode 100644
new mode 100755
diff --git a/modules/gcal_events/gcal_events.info b/modules/gcal_events/gcal_events.info
old mode 100644
new mode 100755
diff --git a/modules/gcal_events/gcal_events.module b/modules/gcal_events/gcal_events.module
old mode 100755
new mode 100644
index 602246d..92f952d
--- a/modules/gcal_events/gcal_events.module
+++ b/modules/gcal_events/gcal_events.module
@@ -548,7 +548,7 @@ function gcal_events_delete_block($block_number) {
  * A block content function.
  */
 function gcal_events_get_events($which_block) {
-
+  
   // for timing
   $start_time = microtime(true);
 
@@ -689,7 +689,11 @@ function gcal_events_get_events($which_block) {
   
       // Now, let's grab the Google-namespaced <gd:where> tag.
       $gd_where = $item->get_item_tags('http://schemas.google.com/g/2005', 'where');
-      $location = $gd_where[0]['attribs']['']['valueString'];
+      if (empty($gd_where[0]['attribs'])) {
+         $location = '';
+      } else {
+         $location = $gd_where[0]['attribs']['']['valueString'];
+      }
   
       //and the status tag too, come to that
       $gd_status = $item->get_item_tags('http://schemas.google.com/g/2005', 'eventStatus');
@@ -718,7 +722,11 @@ function gcal_events_get_events($which_block) {
       }
   
       $where = $item->get_item_tags('http://schemas.google.com/g/2005', 'where');
-      $location = $where[0]['attribs']['']['valueString'];
+      if (empty($gd_where[0]['attribs'])) {
+         $location = '';
+      } else {
+         $location = $gd_where[0]['attribs']['']['valueString'];
+      }
    
       $timeformat = variable_get('gcal_events_timeformat_' . $which_block, "");
       if ($timeformat == "") {
diff --git a/modules/nws_weather/LICENSE.txt b/modules/nws_weather/LICENSE.txt
old mode 100644
new mode 100755
diff --git a/modules/nws_weather/nws_weather.info b/modules/nws_weather/nws_weather.info
old mode 100644
new mode 100755
diff --git a/modules/nws_weather/nws_weather.module b/modules/nws_weather/nws_weather.module
old mode 100755
new mode 100644
index b65f3d6..bc9622f
--- a/modules/nws_weather/nws_weather.module
+++ b/modules/nws_weather/nws_weather.module
@@ -342,7 +342,8 @@ function nws_weather_NDFDgenByDay($lat, $lon, $start = '', $days = 7, $format =
         $timeout = ini_get('default_socket_timeout');
         ini_set('default_socket_timeout', SOCKET_TIMEOUT_SECONDS); 
         $soapclient = new SoapClient(NWS_WEATHER_WSDL_URL);
-        $result = $soapclient->NDFDgenByDay($lat, $lon, $start, $days, $format); 
+        // Add a 5th parameter for updated nws API. '' means use default units 
+        $result = $soapclient->NDFDgenByDay($lat, $lon, $start, $days, '', $format); 
         ini_set('default_socket_timeout', $timeout);
         $triesleft = 0;
       }