diff --git a/.travis.yml b/.travis.yml
index db545d93..329e8820 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,8 +16,8 @@ matrix:
   include:
     - php: 5.6
       env: DB=PGSQL CORE_RELEASE=master
-  allow_failures:
     - php: 7.0
+      env: DB=PGSQL CORE_RELEASE=master
 
 before_script:
   - composer self-update || true
diff --git a/code/SideReport.php b/code/SideReport.php
index 59ec25b4..d0a6bfba 100644
--- a/code/SideReport.php
+++ b/code/SideReport.php
@@ -97,8 +97,9 @@ class SideReportView extends ViewableData
         }
         
         if (isset($info['link']) && $info['link']) {
-            $linkBase = singleton('CMSPageEditController')->Link('show') . '/';
-            $link = ($info['link'] === true) ? $linkBase . $record->ID : $info['link'];
+			$link = ($info['link'] === true && $record->hasMethod('CMSEditLink'))
+				? $record->CMSEditLink()
+				: $info['link'];
             return $prefix . "<a $classClause href=\"$link\">$val</a>";
         } else {
             return $prefix . "<span $classClause>$val</span>";
diff --git a/composer.json b/composer.json
index 35abb04b..52a139b6 100644
--- a/composer.json
+++ b/composer.json
@@ -7,12 +7,12 @@
 	"keywords": ["silverstripe", "cms", "reports"],
 	"authors": [
 		{
-		"name": "SilverStripe",
-		"homepage": "http://silverstripe.com"
+			"name": "SilverStripe",
+			"homepage": "http://silverstripe.com"
 		},
 		{
-		"name": "The SilverStripe Community",
-		"homepage": "http://silverstripe.org"
+			"name": "The SilverStripe Community",
+			"homepage": "http://silverstripe.org"
 		}
 	],
 	"require": {