diff --git a/skeleton/README.md.twig b/skeleton/README.md.twig
index 1f72722..6489e14 100644
--- a/skeleton/README.md.twig
+++ b/skeleton/README.md.twig
@@ -11,7 +11,7 @@ This is a basic skeleton to help you start building a phpBB extension. Customise
 ## Extension Development Guide
 
 New to phpBB extension development?
-Start here: [phpBB Extension Development Guide](https://area51.phpbb.com/docs/dev/3.3.x/extensions/index.html)
+Start here: [phpBB Extension Development Guide](https://area51.phpbb.com/docs/dev/{{ skeleton_version_compare(REQUIREMENTS.phpbb_version_min, "4.0", "<") ? '3.3.x' : 'master' }}/extensions/index.html)
 
 ## License
 
diff --git a/skeleton/migrations/install_sample_data.php.twig b/skeleton/migrations/install_sample_data.php.twig
index 50b9e2b..25405d3 100644
--- a/skeleton/migrations/install_sample_data.php.twig
+++ b/skeleton/migrations/install_sample_data.php.twig
@@ -27,7 +27,6 @@ class install_sample_data extends \phpbb\db\migration\migration
 	/**
 	 * Add, update or delete data stored in the database during extension installation.
 	 *
-	 * https://area51.phpbb.com/docs/dev/3.3.x/migrations/data_changes.html
 {% if COMPONENT.migration %}
 	 *  config.add: Add config data.
 	 *  config.update: Update config data.
@@ -99,7 +98,6 @@ class install_sample_data extends \phpbb\db\migration\migration
 	 * and only needs to be used to perform custom un-installation changes, such as to revert
 	 * changes made by custom functions called in update_data.
 	 *
-	 * https://area51.phpbb.com/docs/dev/3.3.x/migrations/data_changes.html
 	 *  config.add: Add config data.
 	 *  config.update: Update config data.
 	 *  config.remove: Remove config.
diff --git a/skeleton/migrations/install_sample_schema.php.twig b/skeleton/migrations/install_sample_schema.php.twig
index 73158f8..eed991a 100644
--- a/skeleton/migrations/install_sample_schema.php.twig
+++ b/skeleton/migrations/install_sample_schema.php.twig
@@ -25,7 +25,6 @@ class install_sample_schema extends \phpbb\db\migration\migration
 	/**
 	 * Update database schema.
 	 *
-	 * https://area51.phpbb.com/docs/dev/3.3.x/migrations/schema_changes.html
 	 *	add_tables: Add tables
 	 *	drop_tables: Drop tables
 	 *	add_columns: Add columns to a table
@@ -69,7 +68,6 @@ class install_sample_schema extends \phpbb\db\migration\migration
 	 * Revert database schema changes. This method is almost always required
 	 * to revert the changes made above by update_schema.
 	 *
-	 * https://area51.phpbb.com/docs/dev/3.3.x/migrations/schema_changes.html
 	 *	add_tables: Add tables
 	 *	drop_tables: Drop tables
 	 *	add_columns: Add columns to a table
diff --git a/skeleton/tests/controller/main_test.php.twig b/skeleton/tests/controller/main_test.php.twig
index c397eb7..1cd76f0 100644
--- a/skeleton/tests/controller/main_test.php.twig
+++ b/skeleton/tests/controller/main_test.php.twig
@@ -45,9 +45,8 @@ class main_test extends \phpbb_test_case
 			->getMock();
 
 		// Set {{ LANGUAGE.object }}->lang() to return any arguments sent to it
-		${{ LANGUAGE.object }}->expects(self::any())
-			->method('lang')
-			->will(self::returnArgument(0));
+		${{ LANGUAGE.object }}->method('lang')
+			->will($this->returnArgument(0));
 
 		/** @var \phpbb\controller\helper|\PHPUnit\Framework\MockObject\MockObject $controller_helper Mock the controller helper class */
 		$controller_helper = $this->getMockBuilder('\phpbb\controller\helper')