diff --git a/JellyfinPlayer tvOS/Components/LandscapeItemElement.swift b/JellyfinPlayer tvOS/Components/LandscapeItemElement.swift
index 3c397859..e270682d 100644
--- a/JellyfinPlayer tvOS/Components/LandscapeItemElement.swift	
+++ b/JellyfinPlayer tvOS/Components/LandscapeItemElement.swift	
@@ -11,25 +11,23 @@ import SwiftUI
 import JellyfinAPI
 
 private struct CutOffShadow: Shape {
-    let radius = 6.0
-
     func path(in rect: CGRect) -> Path {
         var path = Path()
 
         let tl = CGPoint(x: rect.minX, y: rect.minY)
         let tr = CGPoint(x: rect.maxX, y: rect.minY)
-        let brs = CGPoint(x: rect.maxX, y: rect.maxY - radius)
-        let brc = CGPoint(x: rect.maxX - radius, y: rect.maxY - radius)
-        let bls = CGPoint(x: rect.minX + radius, y: rect.maxY)
-        let blc = CGPoint(x: rect.minX + radius, y: rect.maxY - radius)
+        let brs = CGPoint(x: rect.maxX, y: rect.maxY - 6)
+        let brc = CGPoint(x: rect.maxX - 6, y: rect.maxY - 6)
+        let bls = CGPoint(x: rect.minX + 6, y: rect.maxY)
+        let blc = CGPoint(x: rect.minX + 6, y: rect.maxY - 6)
 
         path.move(to: tl)
         path.addLine(to: tr)
         path.addLine(to: brs)
-        path.addRelativeArc(center: brc, radius: radius,
+        path.addRelativeArc(center: brc, radius: 6,
           startAngle: Angle.degrees(0), delta: Angle.degrees(90))
         path.addLine(to: bls)
-        path.addRelativeArc(center: blc, radius: radius,
+        path.addRelativeArc(center: blc, radius: 6,
           startAngle: Angle.degrees(90), delta: Angle.degrees(90))
 
         return path
diff --git a/JellyfinPlayer tvOS/Components/PortraitItemElement.swift b/JellyfinPlayer tvOS/Components/PortraitItemElement.swift
index 452e4286..c2adad4f 100644
--- a/JellyfinPlayer tvOS/Components/PortraitItemElement.swift	
+++ b/JellyfinPlayer tvOS/Components/PortraitItemElement.swift	
@@ -10,32 +10,6 @@
 import SwiftUI
 import JellyfinAPI
 
-private struct CutOffShadow: Shape {
-    let radius = 6.0
-
-    func path(in rect: CGRect) -> Path {
-        var path = Path()
-
-        let tl = CGPoint(x: rect.minX, y: rect.minY)
-        let tr = CGPoint(x: rect.maxX, y: rect.minY)
-        let brs = CGPoint(x: rect.maxX, y: rect.maxY - radius)
-        let brc = CGPoint(x: rect.maxX - radius, y: rect.maxY - radius)
-        let bls = CGPoint(x: rect.minX + radius, y: rect.maxY)
-        let blc = CGPoint(x: rect.minX + radius, y: rect.maxY - radius)
-
-        path.move(to: tl)
-        path.addLine(to: tr)
-        path.addLine(to: brs)
-        path.addRelativeArc(center: brc, radius: radius,
-          startAngle: Angle.degrees(0), delta: Angle.degrees(90))
-        path.addLine(to: bls)
-        path.addRelativeArc(center: blc, radius: radius,
-          startAngle: Angle.degrees(90), delta: Angle.degrees(90))
-
-        return path
-    }
-}
-
 struct PortraitItemElement: View {
     @Environment(\.isFocused) var envFocused: Bool
     @State var focused: Bool = false
diff --git a/Shared/Singleton/ServerEnvironment.swift b/Shared/Singleton/ServerEnvironment.swift
index a075e78f..7837a55d 100644
--- a/Shared/Singleton/ServerEnvironment.swift
+++ b/Shared/Singleton/ServerEnvironment.swift
@@ -17,7 +17,7 @@ final class ServerEnvironment {
     fileprivate(set) var server: Server!
 
     init() {
-        let serverRequest = Server.fetchRequest()
+        let serverRequest: NSFetchRequest<Server> = Server.fetchRequest()
         let servers = try? PersistenceController.shared.container.viewContext.fetch(serverRequest)
 
         if servers?.count != 0 {
diff --git a/Shared/Singleton/SessionManager.swift b/Shared/Singleton/SessionManager.swift
index 86df8351..19992bc6 100644
--- a/Shared/Singleton/SessionManager.swift
+++ b/Shared/Singleton/SessionManager.swift
@@ -29,7 +29,7 @@ final class SessionManager {
     #endif
 
     init() {
-        let savedUserRequest = SignedInUser.fetchRequest()
+        let savedUserRequest: NSFetchRequest<SignedInUser> = SignedInUser.fetchRequest()
 
         let savedUsers = try? PersistenceController.shared.container.viewContext.fetch(savedUserRequest)
 
@@ -86,7 +86,7 @@ final class SessionManager {
     }
 
     func doesUserHaveSavedSession(userID: String) -> Bool {
-        let savedUserRequest = SignedInUser.fetchRequest()
+        let savedUserRequest: NSFetchRequest<SignedInUser> = SignedInUser.fetchRequest()
         savedUserRequest.predicate = NSPredicate(format: "user_id == %@", userID)
         let savedUsers = try? PersistenceController.shared.container.viewContext.fetch(savedUserRequest)
 
@@ -98,7 +98,7 @@ final class SessionManager {
     }
 
     func getSavedSession(userID: String) -> SignedInUser {
-        let savedUserRequest = SignedInUser.fetchRequest()
+        let savedUserRequest: NSFetchRequest<SignedInUser> = SignedInUser.fetchRequest()
         savedUserRequest.predicate = NSPredicate(format: "user_id == %@", userID)
         let savedUsers = try? PersistenceController.shared.container.viewContext.fetch(savedUserRequest)
         return savedUsers!.first!