diff --git a/appinfo/info.xml b/appinfo/info.xml
index 412ceb2fd..46aa45b6f 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -42,7 +42,7 @@ Requirements:
 		<database>pgsql</database>
 		<lib>intl</lib>
 		<lib>mbstring</lib>
-		<nextcloud min-version="32" max-version="33" />
+		<nextcloud min-version="32" max-version="34" />
 	</dependencies>
 	<background-jobs>
 		<job>OCA\Bookmarks\BackgroundJobs\CrawlJob</job>
diff --git a/lib/AugmentedTemplateResponse.php b/lib/AugmentedTemplateResponse.php
index 6ad9b0417..92f318ba4 100644
--- a/lib/AugmentedTemplateResponse.php
+++ b/lib/AugmentedTemplateResponse.php
@@ -8,8 +8,8 @@
 
 namespace OCA\Bookmarks;
 
-use OC;
 use OCP\AppFramework\Http\TemplateResponse;
+use OCP\IURLGenerator;
 
 /**
  * @template S of \OCP\AppFramework\Http::STATUS_*
@@ -19,7 +19,11 @@
 class AugmentedTemplateResponse extends TemplateResponse {
 	public function render() {
 		$return = parent::render();
-		preg_replace('/<link rel="manifest" href="(.*?)">/i', '<link rel="manifest" href="' . OC::$server->getURLGenerator()->linkToRouteAbsolute('bookmarks.web_view.manifest') . '">', $return);
+		$params = $this->getParams();
+		if (isset($params['url']) && $params['url'] instanceof IURLGenerator) {
+			$manifestUrl = $params['url']->linkToRouteAbsolute('bookmarks.web_view.manifest');
+			$return = preg_replace('/<link rel="manifest" href="(.*?)">/i', '<link rel="manifest" href="' . $manifestUrl . '">', $return);
+		}
 		return $return;
 	}
 }
diff --git a/lib/ExportResponse.php b/lib/ExportResponse.php
index fb9e03e73..1245ac4e8 100644
--- a/lib/ExportResponse.php
+++ b/lib/ExportResponse.php
@@ -8,11 +8,11 @@
 
 namespace OCA\Bookmarks;
 
-use OC;
 use OC\HintException;
 use OCA\Theming\ThemingDefaults;
 use OCP\AppFramework\Http\Response;
 use OCP\IDateTimeFormatter;
+use OCP\IUserSession;
 
 /**
  * @psalm-template S of int
@@ -25,7 +25,7 @@ class ExportResponse extends Response {
 	public function __construct($returnstring) {
 		parent::__construct();
 
-		$user = OC::$server->getUserSession()->getUser();
+		$user = \OCP\Server::get(IUserSession::class)->getUser();
 		if (is_null($user)) {
 			throw new HintException('User not logged in');
 		}