diff --git a/server/Controllers/AudioUploadController.cs b/server/Controllers/AudioUploadController.cs
index 702324e..2707169 100644
--- a/server/Controllers/AudioUploadController.cs
+++ b/server/Controllers/AudioUploadController.cs
@@ -73,7 +73,7 @@ namespace PodNoms.Api.Controllers
                 };
 
                 entry.AudioUrl = await CachedFormFileStorage.CacheItem(file);
-                _entryRepository.AddOrUpdateAsync(entry);
+                await _entryRepository.AddOrUpdateAsync(entry);
                 await _unitOfWork.CompleteAsync();
 
                 BackgroundJob.Enqueue<IAudioUploadProcessService>(service => service.UploadAudio(entry.Id));
diff --git a/server/Controllers/EntryController.cs b/server/Controllers/EntryController.cs
index 18e754e..130029d 100644
--- a/server/Controllers/EntryController.cs
+++ b/server/Controllers/EntryController.cs
@@ -57,10 +57,12 @@ namespace PodNoms.Api.Controllers
             }
         }
         [HttpGet("all/{podcastSlug}")]
-        public async Task<IEnumerable<PodcastEntryViewModel>> GetAllForSlug(string podcastSlug)
+        public async Task<IActionResult> GetAllForSlug(string podcastSlug)
         {
             var entries = await _repository.GetAllAsync(podcastSlug);
-            return _mapper.Map<List<PodcastEntry>, List<PodcastEntryViewModel>>(entries.ToList());
+            var results = _mapper.Map<List<PodcastEntry>, List<PodcastEntryViewModel>>(entries.ToList());
+
+            return Ok(results);
         }
 
         [HttpPost]
diff --git a/server/Controllers/ImageUploadController.cs b/server/Controllers/ImageUploadController.cs
index a41f8cf..45d7f6b 100644
--- a/server/Controllers/ImageUploadController.cs
+++ b/server/Controllers/ImageUploadController.cs
@@ -65,7 +65,7 @@ namespace PodNoms.Api.Controllers
                 var imageUrl = await _fileUploader.UploadFile(finishedFile, _imageFileStorageSettings.ContainerName,
                     destinationFile, (p, t) => _logger.LogDebug($"Uploading image: {p} - {t}"));
 
-                _repository.AddOrUpdateAsync(podcast);
+                await _repository.AddOrUpdateAsync(podcast);
 
                 await this._unitOfWork.CompleteAsync();
 
diff --git a/server/Providers/MappingProvider.cs b/server/Providers/MappingProvider.cs
index 5734bf0..ed1c81c 100644
--- a/server/Providers/MappingProvider.cs
+++ b/server/Providers/MappingProvider.cs
@@ -28,7 +28,7 @@ namespace PodNoms.Api.Providers
             CreateMap<PodcastEntry, PodcastEntryViewModel>()
                 .ForMember(
                     src => src.AudioUrl,
-                    e => e.MapFrom(m => $"ArgleBargle{m.AudioUrl}"));
+                    e => e.MapFrom(m => $"{this._options.GetSection("Storage")["CdnUrl"]}{m.AudioUrl}"));
                     
             CreateMap<User, ProfileViewModel>();
 
@@ -37,7 +37,6 @@ namespace PodNoms.Api.Providers
                 .ForMember(v => v.ImageUrl, opt => opt.Ignore())
             ;
             CreateMap<PodcastEntryViewModel, PodcastEntry>()
-                .ReverseMap()
                 .ForMember(
                     e => e.ImageUrl,
                     opt => opt.MapFrom(m => m.ImageUrl))