diff --git a/admin/code/LeftAndMain.php b/admin/code/LeftAndMain.php
index 20b652fa9..1a12da84c 100644
--- a/admin/code/LeftAndMain.php
+++ b/admin/code/LeftAndMain.php
@@ -1172,7 +1172,7 @@ class LeftAndMain extends Controller implements PermissionProvider {
 	 * @return string
 	 */
 	public function CMSVersion() {
-		if(file_exists(CMS_PATH . '/silverstripe_version')) {
+		if(defined('CMS_PATH') && file_exists(CMS_PATH . '/silverstripe_version')) {
 			$sapphireVersion = file_get_contents(CMS_PATH . '/silverstripe_version');
 		} else {
 			$sapphireVersion = file_get_contents(SAPPHIRE_PATH . '/silverstripe_version');
diff --git a/admin/javascript/LeftAndMain.EditForm.js b/admin/javascript/LeftAndMain.EditForm.js
index 4083f87ca..f21c28c68 100644
--- a/admin/javascript/LeftAndMain.EditForm.js
+++ b/admin/javascript/LeftAndMain.EditForm.js
@@ -142,7 +142,7 @@
 			 * Suppress submission unless it is handled through ajaxSubmit().
 			 */
 			onsubmit: function(e, button) {
-				this.parents('.cms-content').submitForm(this, button);
+				this.closest('.cms-content').submitForm(this, button);
 				
 				return false;
 			},
diff --git a/forms/gridfield/GridField.php b/forms/gridfield/GridField.php
index ed342adf5..b4a4c4ad6 100755
--- a/forms/gridfield/GridField.php
+++ b/forms/gridfield/GridField.php
@@ -619,7 +619,7 @@ class GridField extends FormField {
 			}
 		}
 		
-		switch($request->getHeader('X-Get-Fragment')) {
+		switch($request->getHeader('X-Pjax')) {
 			case 'CurrentField':
 				return $this->FieldHolder();
 				break;
diff --git a/forms/gridfield/GridFieldDetailForm.php b/forms/gridfield/GridFieldDetailForm.php
index 58bd39d5c..e7dc55fdc 100755
--- a/forms/gridfield/GridFieldDetailForm.php
+++ b/forms/gridfield/GridFieldDetailForm.php
@@ -311,7 +311,7 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler {
 		
 		$form->sessionMessage($message, 'good');
 
-		return Controller::curr()->redirectBack();
+		return Controller::curr()->redirect($this->Link());
 	}
 
 	function doDelete($data, $form) {