diff --git a/notifyall/notifyall.php b/notifyall/notifyall.php
index a01930392..824e306b9 100644
--- a/notifyall/notifyall.php
+++ b/notifyall/notifyall.php
@@ -28,7 +28,7 @@ function notifyall_module() {}
 
 function notifyall_addon_admin(App $a, &$o)
 {
-	$o = '<div></div>&nbsp;&nbsp;&nbsp;&nbsp;<a href="' . z_root() . '/notifyall">' . L10n::t('Send email to all members') . '</a></br/>';
+	$o = '<div></div>&nbsp;&nbsp;&nbsp;&nbsp;<a href="' . $a->getBaseURL() . '/notifyall">' . L10n::t('Send email to all members') . '</a></br/>';
 }
 
 
diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index 0420591eb..8255b940e 100644
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -155,7 +155,7 @@ function openstreetmap_generate_map(&$a, &$b)
 {
 	$tmsserver = Config::get('openstreetmap', 'tmsserver', OSM_TMS);
 
-	if (strpos(z_root(), 'https:') !== false) {
+	if (strpos($a->getBaseURL(true), 'https:') !== false) {
 		$tmsserver = str_replace('http:','https:',$tmsserver);
 	}