diff --git a/Mac/AppDelegate.swift b/Mac/AppDelegate.swift
index 2d3d0c244..f344a7c26 100644
--- a/Mac/AppDelegate.swift
+++ b/Mac/AppDelegate.swift
@@ -85,7 +85,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations,
 		NSWindow.allowsAutomaticWindowTabbing = false
 		super.init()
 
-		AccountManager.shared = AccountManager(accountsFolder: RSDataSubfolder(nil, "Accounts")!)
+		AccountManager.shared = AccountManager(accountsFolder: Platform.dataSubfolder(forApplication: nil, folderName: "Accounts")!)
 		
 		NotificationCenter.default.addObserver(self, selector: #selector(unreadCountDidChange(_:)), name: .UnreadCountDidChange, object: nil)
 		NotificationCenter.default.addObserver(self, selector: #selector(inspectableObjectsDidChange(_:)), name: .InspectableObjectsDidChange, object: nil)
diff --git a/Mac/MainWindow/AddFeed/AddFeedController.swift b/Mac/MainWindow/AddFeed/AddFeedController.swift
index 13ac321fa..167ffdf26 100644
--- a/Mac/MainWindow/AddFeed/AddFeedController.swift
+++ b/Mac/MainWindow/AddFeed/AddFeedController.swift
@@ -98,7 +98,7 @@ class AddFeedController: AddFeedWindowControllerDelegate {
 private extension AddFeedController {
 
 	var urlStringFromPasteboard: String? {
-		if let urlString = NSPasteboard.rs_urlString(from: NSPasteboard.general) {
+		if let urlString = NSPasteboard.urlString(from: NSPasteboard.general) {
 			return urlString.rs_normalizedURL()
 		}
 		return nil
diff --git a/Shared/ArticleStyles/ArticleStylesManager.swift b/Shared/ArticleStyles/ArticleStylesManager.swift
index 7bd161c1c..2ce79f5e5 100644
--- a/Shared/ArticleStyles/ArticleStylesManager.swift
+++ b/Shared/ArticleStyles/ArticleStylesManager.swift
@@ -24,7 +24,7 @@ private let styleSuffixes = [styleSuffix, nnwStyleSuffix, cssStyleSuffix];
 final class ArticleStylesManager {
 
 	static let shared = ArticleStylesManager()
-	private let folderPath = RSDataSubfolder(nil, stylesFolderName)!
+	private let folderPath = Platform.dataSubfolder(forApplication: nil, folderName: stylesFolderName)!
 
 	var currentStyleName: String {
 		get {
diff --git a/submodules/RSCore b/submodules/RSCore
index 525f0d9ad..806d1fdc1 160000
--- a/submodules/RSCore
+++ b/submodules/RSCore
@@ -1 +1 @@
-Subproject commit 525f0d9ad5edd49108ccdecb4e47dbe10e9bb217
+Subproject commit 806d1fdc16511a9469bf2a18348caf9f20ff8cdc