diff --git a/Vagrantfile b/Vagrantfile
index 195c1621f5..ab225c9ad9 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -2,7 +2,7 @@ require 'json'
 require 'yaml'
 
 VAGRANTFILE_API_VERSION ||= "2"
-confDir = $confDir ||= File.expand_path("phpBB/vendor/laravel/homestead", File.__DIR__)
+confDir = $confDir ||= File.expand_path("phpBB/vendor/laravel/homestead", File.dirname(__FILE__))
 
 homesteadYamlPath = "vagrant/bootstrap.yaml"
 afterScriptPath = "vagrant/after.sh"
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 14640d6c52..06ff2eca84 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3240,12 +3240,12 @@ function phpbb_filter_root_path($errfile)
 	{
 		if ($phpbb_filesystem)
 		{
-			$root_path = $phpbb_filesystem-> realpath(__DIR__ . '/../');
+			$root_path = $phpbb_filesystem->realpath(__DIR__ . '/../');
 		}
 		else
 		{
 			$filesystem = new \phpbb\filesystem\filesystem();
-			$root_path = $filesystem-> realpath(__DIR__ . '/../');
+			$root_path = $filesystem->realpath(__DIR__ . '/../');
 		}
 	}