diff --git a/core/Object.php b/core/Object.php
index c1a9bb370..d6da4c9a5 100755
--- a/core/Object.php
+++ b/core/Object.php
@@ -605,7 +605,7 @@ abstract class Object {
 				user_error("Bad extension '$extension'", E_USER_WARNING);
 			} else {
 				$extensionClass = $matches[1];
-				DataObjectDecorator::unload_extra_statics($class, $extensionClass);
+				DataExtension::unload_extra_statics($class, $extensionClass);
 			}
 		}
 		
diff --git a/forms/gridfield/GridField.php b/forms/gridfield/GridField.php
index 7f9628ebe..4548f8f9f 100755
--- a/forms/gridfield/GridField.php
+++ b/forms/gridfield/GridField.php
@@ -650,7 +650,7 @@ class GridField extends FormField {
 				continue;
 			}
 			
-			if(is_array($component->getActions($this)) && in_array($actionName, array_map('strtolower', $component->getActions($this)))) {
+			if(in_array($actionName, array_map('strtolower', (array)$component->getActions($this)))) {
 				return $component->handleAction($this, $actionName, $args, $data);
 			}
 		}
diff --git a/model/ListDecorator.php b/model/ListDecorator.php
index 19fb11150..facbb2944 100644
--- a/model/ListDecorator.php
+++ b/model/ListDecorator.php
@@ -137,7 +137,7 @@ abstract class SS_ListDecorator extends ViewableData implements SS_List, SS_Sort
 	}
 
 	public function limit($limit, $offset = 0) {
-		return $this->list->getRange($length, $offset);
+		return $this->list->limit($limit, $offset);
 	}
 
 	/**