diff --git a/Frameworks/Account/FeedWrangler/FeedWranglerAccountDelegate.swift b/Frameworks/Account/FeedWrangler/FeedWranglerAccountDelegate.swift
index 6ed331340..8186e378b 100644
--- a/Frameworks/Account/FeedWrangler/FeedWranglerAccountDelegate.swift
+++ b/Frameworks/Account/FeedWrangler/FeedWranglerAccountDelegate.swift
@@ -511,7 +511,7 @@ private extension FeedWranglerAccountDelegate {
 		let parsedItems = feedItems.map { (item: FeedWranglerFeedItem) -> ParsedItem in
 			let itemID = String(item.feedItemID)
 			// let authors = ...
-			let parsedItem = ParsedItem(syncServiceID: itemID, uniqueID: itemID, feedURL: String(item.feedID), url: nil, externalURL: item.url, title: item.title, language: nil, contentHTML: item.body, contentText: nil, summary: nil, imageURL: nil, bannerImageURL: nil, datePublished: item.publishedDate, dateModified: item.updatedDate, authors: nil, tags: nil, attachments: nil)
+			let parsedItem = ParsedItem(syncServiceID: itemID, uniqueID: itemID, feedURL: String(item.feedID), url: nil, externalURL: item.url, title: item.title, contentHTML: item.body, contentText: nil, summary: nil, imageURL: nil, bannerImageURL: nil, datePublished: item.publishedDate, dateModified: item.updatedDate, authors: nil, tags: nil, attachments: nil)
 			
 			return parsedItem
 		}
diff --git a/Frameworks/Account/Feedbin/FeedbinAccountDelegate.swift b/Frameworks/Account/Feedbin/FeedbinAccountDelegate.swift
index 3d6e7d19d..35818a012 100644
--- a/Frameworks/Account/Feedbin/FeedbinAccountDelegate.swift
+++ b/Frameworks/Account/Feedbin/FeedbinAccountDelegate.swift
@@ -1233,7 +1233,7 @@ private extension FeedbinAccountDelegate {
 		
 		let parsedItems: [ParsedItem] = entries.map { entry in
 			let authors = Set([ParsedAuthor(name: entry.authorName, url: entry.jsonFeed?.jsonFeedAuthor?.url, avatarURL: entry.jsonFeed?.jsonFeedAuthor?.avatarURL, emailAddress: nil)])
-			return ParsedItem(syncServiceID: String(entry.articleID), uniqueID: String(entry.articleID), feedURL: String(entry.feedID), url: entry.url, externalURL: nil, title: entry.title, language: nil, contentHTML: entry.contentHTML, contentText: nil, summary: entry.summary, imageURL: nil, bannerImageURL: nil, datePublished: entry.parsedDatePublished, dateModified: nil, authors: authors, tags: nil, attachments: nil)
+			return ParsedItem(syncServiceID: String(entry.articleID), uniqueID: String(entry.articleID), feedURL: String(entry.feedID), url: entry.url, externalURL: nil, title: entry.title, contentHTML: entry.contentHTML, contentText: nil, summary: entry.summary, imageURL: nil, bannerImageURL: nil, datePublished: entry.parsedDatePublished, dateModified: nil, authors: authors, tags: nil, attachments: nil)
 		}
 		
 		return Set(parsedItems)
diff --git a/Frameworks/Account/Feedly/Models/FeedlyEntryParser.swift b/Frameworks/Account/Feedly/Models/FeedlyEntryParser.swift
index 2da2edc84..8af6714c7 100644
--- a/Frameworks/Account/Feedly/Models/FeedlyEntryParser.swift
+++ b/Frameworks/Account/Feedly/Models/FeedlyEntryParser.swift
@@ -98,7 +98,6 @@ struct FeedlyEntryParser {
 						  url: nil,
 						  externalURL: externalUrl,
 						  title: title,
-						  language: nil,
 						  contentHTML: contentHMTL,
 						  contentText: contentText,
 						  summary: summary,
diff --git a/Frameworks/Account/Feedly/OAuthAuthorizationCodeGranting.swift b/Frameworks/Account/Feedly/OAuthAuthorizationCodeGranting.swift
index 836989e78..735f33bff 100644
--- a/Frameworks/Account/Feedly/OAuthAuthorizationCodeGranting.swift
+++ b/Frameworks/Account/Feedly/OAuthAuthorizationCodeGranting.swift
@@ -70,12 +70,12 @@ public extension OAuthAuthorizationResponse {
 		guard let queryItems = components.queryItems, !queryItems.isEmpty else {
 			throw URLError(.unsupportedURL)
 		}
-		let code = queryItems.first { $0.name.lowercased() == "code" }
+		let code = queryItems.firstElementPassingTest { $0.name.lowercased() == "code" }
 		guard let codeValue = code?.value, !codeValue.isEmpty else {
 			throw URLError(.unsupportedURL)
 		}
 		
-		let state = queryItems.first { $0.name.lowercased() == "state" }
+		let state = queryItems.firstElementPassingTest { $0.name.lowercased() == "state" }
 		let stateValue = state?.value
 		
 		self.init(code: codeValue, state: stateValue)
diff --git a/Frameworks/Account/ReaderAPI/ReaderAPIAccountDelegate.swift b/Frameworks/Account/ReaderAPI/ReaderAPIAccountDelegate.swift
index 89095f3a0..ad55d4e6c 100644
--- a/Frameworks/Account/ReaderAPI/ReaderAPIAccountDelegate.swift
+++ b/Frameworks/Account/ReaderAPI/ReaderAPIAccountDelegate.swift
@@ -932,7 +932,7 @@ private extension ReaderAPIAccountDelegate {
 			// let authors = Set([ParsedAuthor(name: entry.authorName, url: entry.jsonFeed?.jsonFeedAuthor?.url, avatarURL: entry.jsonFeed?.jsonFeedAuthor?.avatarURL, emailAddress: nil)])
 			// let feed = account.idToFeedDictionary[entry.origin.streamId!]! // TODO clean this up
 			
-			return ParsedItem(syncServiceID: entry.uniqueID(), uniqueID: entry.uniqueID(), feedURL: entry.origin.streamId!, url: nil, externalURL: entry.alternates.first?.url, title: entry.title, language: nil, contentHTML: entry.summary.content, contentText: nil, summary: entry.summary.content, imageURL: nil, bannerImageURL: nil, datePublished: entry.parseDatePublished(), dateModified: nil, authors: nil, tags: nil, attachments: nil)
+			return ParsedItem(syncServiceID: entry.uniqueID(), uniqueID: entry.uniqueID(), feedURL: entry.origin.streamId!, url: nil, externalURL: entry.alternates.first?.url, title: entry.title, contentHTML: entry.summary.content, contentText: nil, summary: entry.summary.content, imageURL: nil, bannerImageURL: nil, datePublished: entry.parseDatePublished(), dateModified: nil, authors: nil, tags: nil, attachments: nil)
 		}
 		
 		return Set(parsedItems)
diff --git a/iOS/Article/OpenInSafariActivity.swift b/iOS/Article/OpenInSafariActivity.swift
index 9b5b5ed8f..a157345fb 100644
--- a/iOS/Article/OpenInSafariActivity.swift
+++ b/iOS/Article/OpenInSafariActivity.swift
@@ -37,7 +37,7 @@ class OpenInSafariActivity: UIActivity {
 	}
 	
 	override func perform() {
-		guard let url = activityItems?.first(where: { $0 is URL }) as? URL else {
+		guard let url = activityItems?.firstElementPassingTest({ $0 is URL }) as? URL else {
 			activityDidFinish(false)
 			return
 		}