diff --git a/UPGRADE.md b/UPGRADE.md
index f8540cfd5..4bc3a6aef 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -92,6 +92,7 @@ The following methods have changed:
 
 ### Things to do
 
-- Remove "Cron" package, drop + create relevant tables
-- Implement registerSchedule() in PluginBase
+- Remove "Cron" package, test new "jobs" table
+- Test scheduler
+- Remove deprecated code
 - Fix unit tests
\ No newline at end of file
diff --git a/modules/backend/classes/BackendHelper.php b/modules/backend/classes/BackendHelper.php
index f07637c81..d904f47c6 100644
--- a/modules/backend/classes/BackendHelper.php
+++ b/modules/backend/classes/BackendHelper.php
@@ -1,6 +1,6 @@
 <?php namespace Backend\Classes;
 
-use URL;
+use Url;
 use Config;
 use Request;
 use October\Rain\Router\Helper as RouterHelper;
@@ -19,7 +19,7 @@ class BackendHelper
     public function url($path = null, $parameters = array(), $secure = null)
     {
         $backendUri = Config::get('cms.backendUri');
-        return URL::to($backendUri . '/' . $path, $parameters, $secure);
+        return Url::to($backendUri . '/' . $path, $parameters, $secure);
     }
 
     /**
@@ -28,7 +28,7 @@ class BackendHelper
     public function skinAsset($path = null)
     {
         $skinPath = Skin::getActive()->getPath($path, true);
-        return URL::asset($skinPath);
+        return Url::asset($skinPath);
     }
 
     /**
diff --git a/modules/cms/classes/Controller.php b/modules/cms/classes/Controller.php
index ab6befb55..eba3407c3 100644
--- a/modules/cms/classes/Controller.php
+++ b/modules/cms/classes/Controller.php
@@ -1046,14 +1046,14 @@ class Controller
         $themePath = Config::get('cms.themesDir').'/'.$this->getTheme()->getDirName();
 
         if (is_array($url)) {
-            $_url = Request::getBaseUrl();
-            $_url .= CombineAssets::combine($url, $themePath);
+            $_url = URL::to(CombineAssets::combine($url, $themePath));
         }
         else {
-            $_url = Request::getBasePath().$themePath;
+            $_url = $themePath;
             if ($url !== null) {
                 $_url .= '/'.$url;
             }
+            $_url = URL::asset($_url);
         }
 
         return $_url;
@@ -1085,8 +1085,9 @@ class Controller
         }
 
         foreach ($this->partialComponentStack as $componentInfo) {
-            if ($componentInfo['name'] == $name)
+            if ($componentInfo['name'] == $name) {
                 return $componentInfo['obj'];
+            }
         }
 
         return null;
diff --git a/modules/system/classes/CombineAssets.php b/modules/system/classes/CombineAssets.php
index ad50e8c75..4114464dd 100644
--- a/modules/system/classes/CombineAssets.php
+++ b/modules/system/classes/CombineAssets.php
@@ -348,7 +348,7 @@ class CombineAssets
             return URL::action($combineAction, [$outputFilename], false);
         }
         else {
-            return Request::getBasePath().'/combine/'.$outputFilename;
+            return '/combine/'.$outputFilename;
         }
     }
 
diff --git a/modules/system/providers.php b/modules/system/providers.php
index b0ef99b5d..98634fd2f 100644
--- a/modules/system/providers.php
+++ b/modules/system/providers.php
@@ -32,6 +32,7 @@ return [
     'October\Rain\Database\DatabaseServiceProvider',
     'October\Rain\Filesystem\FilesystemServiceProvider',
     'October\Rain\Html\HtmlServiceProvider',
+    'October\Rain\Html\UrlServiceProvider',
     'October\Rain\Network\NetworkServiceProvider',
     'October\Rain\Scaffold\ScaffoldServiceProvider',
     'October\Rain\Flash\FlashServiceProvider',
diff --git a/modules/system/traits/AssetMaker.php b/modules/system/traits/AssetMaker.php
index 9187935a6..e3aea95de 100644
--- a/modules/system/traits/AssetMaker.php
+++ b/modules/system/traits/AssetMaker.php
@@ -1,8 +1,8 @@
 <?php namespace System\Traits;
 
+use Url;
 use Html;
 use File;
-use Request;
 use System\Models\Parameters;
 use System\Models\PluginVersion;
 use SystemException;
@@ -271,7 +271,7 @@ trait AssetMaker
         }
 
         if (substr($asset, 0, 1) == '/') {
-            $asset = Request::getBasePath() . $asset;
+            $asset = Url::asset($asset);
         }
 
         return $asset;
diff --git a/tests/unit/backend/traits/WidgetMakerTest.php b/tests/unit/backend/traits/WidgetMakerTest.php
index 3401fe6df..c55922200 100644
--- a/tests/unit/backend/traits/WidgetMakerTest.php
+++ b/tests/unit/backend/traits/WidgetMakerTest.php
@@ -30,6 +30,8 @@ class WidgetMakerTest extends TestCase
      */
     public function setUp()
     {
+        parent::setUp();
+
         $traitName = 'Backend\Traits\WidgetMaker';
         $this->traitObject = $this->getObjectForTrait($traitName);
     }