diff --git a/LANCommander.Server/Controllers/Api/ProfileController.cs b/LANCommander.Server/Controllers/Api/ProfileController.cs
index 1fd7c856..1229a611 100644
--- a/LANCommander.Server/Controllers/Api/ProfileController.cs
+++ b/LANCommander.Server/Controllers/Api/ProfileController.cs
@@ -34,7 +34,7 @@ namespace LANCommander.Server.Controllers.Api
         {
             if (User != null && User.Identity != null && User.Identity.IsAuthenticated)
             {
-                var user = await UserService.GetAsync(User?.Identity?.Name);
+                var user = await UserService.GetAsync<SDK.Models.User>(User?.Identity?.Name);
 
                 if (user != null)
                     return Ok(user);
diff --git a/LANCommander.Server/Controllers/Api/SavesController.cs b/LANCommander.Server/Controllers/Api/SavesController.cs
index 98159955..9a1d4f20 100644
--- a/LANCommander.Server/Controllers/Api/SavesController.cs
+++ b/LANCommander.Server/Controllers/Api/SavesController.cs
@@ -73,12 +73,12 @@ namespace LANCommander.Server.Controllers.Api
             if (user == null)
                 return Unauthorized();
 
-            var latestSave = await GameSaveService.FirstOrDefaultAsync(gs => gs.UserId == user.Id && gs.GameId == gameId, gs => gs.CreatedOn);
+            var latestSave = await GameSaveService.FirstOrDefaultAsync<SDK.Models.GameSave>(gs => gs.UserId == user.Id && gs.GameId == gameId, gs => gs.CreatedOn);
 
             // Should probably return 404 if no latest save exists
             // Not sure if this will affect launcher stability
 
-            return Ok(Mapper.Map<SDK.Models.GameSave>(latestSave));
+            return Ok(latestSave);
         }
 
         [HttpGet("DownloadLatest/{gameId}")]