diff --git a/api/VersionedRestfulServer.php b/api/VersionedRestfulServer.php
index 3eebe964c..e54672df3 100644
--- a/api/VersionedRestfulServer.php
+++ b/api/VersionedRestfulServer.php
@@ -11,7 +11,7 @@ class VersionedRestfulServer extends Controller {
 		'index'
 	);
 	
-	function handleRequest($request, $model) {
+	function handleRequest(SS_HTTPRequest $request, DataModel $model) {
 		$this->setModel($model);
 		Versioned::reading_stage('Live');
 		$restfulserver = new RestfulServer();
diff --git a/dev/CodeViewer.php b/dev/CodeViewer.php
index 797df709c..a2546da35 100644
--- a/dev/CodeViewer.php
+++ b/dev/CodeViewer.php
@@ -36,7 +36,7 @@ class CodeViewer extends Controller {
 			'{' => 'classBody',
 		),
 		'classBody' => array(
-			T_FUNCTION => array('methodName','createMethod'),
+			T_FUNCTION => array('methodName','createBodyMethod'),
 			'}' => array('start', 'completeClass'),
 			T_DOC_COMMENT => array('', 'saveMethodComment'),
 		),
@@ -159,7 +159,7 @@ class CodeViewer extends Controller {
 		$this->classes[] = $this->currentClass;
 	}
 	
-	function createMethod($token) {
+	function createBodyMethod($token) {
 		$this->currentMethod = array();
 		$this->currentMethod['content'] = "<pre>";
 		$this->currentMethod['description'] = $this->methodComment['pretty'];
diff --git a/dev/TestViewer.php b/dev/TestViewer.php
index 48701bb6c..7792b0ab0 100644
--- a/dev/TestViewer.php
+++ b/dev/TestViewer.php
@@ -22,7 +22,7 @@ class TestViewer extends Controller {
 			'{' => 'classBody',
 		),
 		'classBody' => array(
-			T_FUNCTION => array('methodName','createMethod'),
+			T_FUNCTION => array('methodName','createBodyMethod'),
 			'}' => array('start', 'completeClass'),
 		),
 		'methodName' => array(
@@ -84,7 +84,7 @@ class TestViewer extends Controller {
 		$this->classes[] = $this->currentClass;
 	}
 	
-	function createMethod($token) {
+	function createBodyMethod($token) {
 		$this->currentMethod = array();
 		$this->currentMethod['content'] = "<pre>";
 	}
diff --git a/forms/DisabledTransformation.php b/forms/DisabledTransformation.php
index b3d33d61e..f3cab5d5b 100644
--- a/forms/DisabledTransformation.php
+++ b/forms/DisabledTransformation.php
@@ -5,7 +5,7 @@
  * @subpackage transformations
  */
 class DisabledTransformation extends FormTransformation {
-	public function transform($field) {
+	function transform(FormField $field) {
 		return $field->performDisabledTransformation($this);
 	}
 }
diff --git a/model/fieldtypes/MultiEnum.php b/model/fieldtypes/MultiEnum.php
index 054cd21f0..b1a47583e 100644
--- a/model/fieldtypes/MultiEnum.php
+++ b/model/fieldtypes/MultiEnum.php
@@ -41,7 +41,7 @@ class MultiEnum extends Enum {
 	/**
 	 * Return a {@link CheckboxSetField} suitable for editing this field 
 	 */
-	function formField($title = null, $name = null, $hasEmpty = false, $value = "", $form = null) {
+	function formField($title = null, $name = null, $hasEmpty = false, $value = "", $form = null, $emptyString = null) {
 		if(!$title) $title = $this->name;
 		if(!$name) $name = $this->name;
 
@@ -51,4 +51,3 @@ class MultiEnum extends Enum {
 	}
 }
 
- ?>
diff --git a/parsers/HTML/HTMLBBCodeParser.php b/parsers/HTML/HTMLBBCodeParser.php
index f1ee1af2b..c190c4f11 100644
--- a/parsers/HTML/HTMLBBCodeParser.php
+++ b/parsers/HTML/HTMLBBCodeParser.php
@@ -177,7 +177,7 @@ class SSHTMLBBCodeParser
         $this->addFilters($this->_options['filters']);
     }
     
-    function &getStaticProperty($class, $var)
+    static function &getStaticProperty($class, $var)
     {
         static $properties;
         if (!isset($properties[$class])) {