diff --git a/include/poller.php b/include/poller.php
index 44f4895cdb..a6671f5ae3 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -484,7 +484,7 @@ function call_worker() {
 		return;
 	}
 
-	$url = get_app()->get_baseurl()."/worker";
+	$url = App::get_baseurl()."/worker";
 	fetch_url($url, false, $redirects, 1);
 }
 
diff --git a/mod/proxy.php b/mod/proxy.php
index ff58bba7f1..45c9e94569 100644
--- a/mod/proxy.php
+++ b/mod/proxy.php
@@ -326,7 +326,7 @@ function proxy_is_local_image($url) {
 	if (strtolower(substr($url, 0, 5)) == "data:") return true;
 
 	// links normalised - bug #431
-	$baseurl = normalise_link(get_app()->get_baseurl());
+	$baseurl = normalise_link(App::get_baseurl());
 	$url = normalise_link($url);
 	return (substr($url, 0, strlen($baseurl)) == $baseurl);
 }