diff --git a/airtime_mvc/application/services/PodcastEpisodeService.php b/airtime_mvc/application/services/PodcastEpisodeService.php
index 089c9f071..75bc4d81a 100644
--- a/airtime_mvc/application/services/PodcastEpisodeService.php
+++ b/airtime_mvc/application/services/PodcastEpisodeService.php
@@ -243,6 +243,8 @@ class Application_Service_PodcastEpisodeService extends Application_Service_Thir
         if ($isStationPodcast) {
             $episodes = $episodes->setLimit($limit);
         }
+        // XXX: We should maybe try to alias this so we don't pass CcFiles as an array key to the frontend.
+        //      It would require us to iterate over all the episodes and change the key for the response though...
         $episodes = $episodes->joinWith('PodcastEpisodes.CcFiles')
             ->setOffset($offset)
             ->orderBy($sortColumn, $sortDir)
diff --git a/airtime_mvc/application/views/scripts/library/publish-dialog.phtml b/airtime_mvc/application/views/scripts/library/publish-dialog.phtml
index 6f9f5fabc..ff6501997 100644
--- a/airtime_mvc/application/views/scripts/library/publish-dialog.phtml
+++ b/airtime_mvc/application/views/scripts/library/publish-dialog.phtml
@@ -36,7 +36,7 @@
                 <div class="published-sources" ng-repeat="(source, label) in sources.published">
                     <span class="sp-checked-icon checked-icon left-floated"></span>
                     <span class="source-name">{{label}}</span>
-                    <button class="btn btn-small" ng-click="remove(source)"><?php echo _("Remove") ?></button>
+                    <button class="btn btn-small" ng-click="remove(source)"><?php echo _("Unpublish") ?></button>
                 </div>
                 <div ng-if="sources.published.length == 0">
                     <?php echo _("You haven't published this track to any sources!") . "<br/>"
diff --git a/airtime_mvc/public/js/airtime/library/podcast.js b/airtime_mvc/public/js/airtime/library/podcast.js
index 3a9d28f30..16295e3b9 100644
--- a/airtime_mvc/public/js/airtime/library/podcast.js
+++ b/airtime_mvc/public/js/airtime/library/podcast.js
@@ -205,7 +205,7 @@ var AIRTIME = (function (AIRTIME) {
         var $scope = this.$scope,
             buttons = {
                 editBtn: {
-                    title           : $.i18n._('Edit'),
+                    title           : $.i18n._('Edit Metadata'),
                     iconClass       : 'icon-pencil',
                     extraBtnClass   : '',
                     elementId       : '',
@@ -216,7 +216,7 @@ var AIRTIME = (function (AIRTIME) {
                     }
                 },
                 deleteBtn: {
-                    title           : $.i18n._('Delete'),
+                    title           : $.i18n._('Unpublish'),
                     iconClass       : 'icon-trash',
                     extraBtnClass   : 'btn-danger',
                     elementId       : '',