diff --git a/modules/block/block.admin.inc b/modules/block/block.admin.inc
index eeff541ed90aaf936f6e71e47b0e4449d982f951..f09b5a8b17ce0e040b818324448b6b797f46dbeb 100644
--- a/modules/block/block.admin.inc
+++ b/modules/block/block.admin.inc
@@ -123,8 +123,7 @@ function _block_compare($a, $b) {
     return $status;
   }
   // Sort by region (in the order defined by theme .info file).
-  $place = $regions[$a['region']] - $regions[$b['region']];
-  if ($place) {
+  if ((!empty($a['region']) && !empty($b['region'])) && ($place = ($regions[$a['region']] - $regions[$b['region']]))) {
     return $place;
   }
   // Sort by weight.
diff --git a/modules/node/content_types.inc b/modules/node/content_types.inc
index d6e6b92e922b41a44596c140f970d1846c67c2d1..12273f850331aa911bb679daade3851b2ec097da 100644
--- a/modules/node/content_types.inc
+++ b/modules/node/content_types.inc
@@ -364,7 +364,7 @@ function node_node_type($op, $info) {
 function node_type_reset(&$type) {
   $info_array = module_invoke_all('node_info');
   if (isset($info_array[$type->orig_type])) {
-    $info_array[$type->orig_type]['type'] = $type->orig_type; 
+    $info_array[$type->orig_type]['type'] = $type->orig_type;
     $info = _node_type_set_defaults($info_array[$type->orig_type]);
 
     foreach ($info as $field => $value) {