diff --git a/includes/jw_player.build.inc b/includes/jw_player.build.inc
index 94fc492..e2a269b 100644
--- a/includes/jw_player.build.inc
+++ b/includes/jw_player.build.inc
@@ -77,6 +77,13 @@ function jw_player_build_preset_options($preset_machine_name) {
         if (!isset($preset_settings['skin']) || empty($preset_settings['skin'])) {
           unset($preset_settings['skin']);
         }
+        // Reset skin into an array, since JW7 allows for different skin options.
+        else {
+          $skin = $preset_settings['skin'];
+          unset($preset_settings['skin']);
+          $preset_settings['skin'] = array();
+          $preset_settings['skin']['name'] = $skin;
+        }
       }
       // Sharing sites settings.
       if (isset($preset_settings['sharing']) && $preset_settings['sharing']) {
diff --git a/jw_player.module b/jw_player.module
index 8b71912..d5a69bf 100644
--- a/jw_player.module
+++ b/jw_player.module
@@ -411,19 +411,19 @@ function jw_player_preset_settings($preset_machine_name) {
     }
     // Enabled options.
     $enabled = array();
-    if ($preset_settings['autostart']) {
+    if (isset($preset_settings['autostart']) && $preset_settings['autostart']) {
       $enabled[] = t('Autostart');
     }
-    if ($preset_settings['mute']) {
+    if (isset($preset_settings['mute']) && $preset_settings['mute']) {
       $enabled[] = t('Mute');
     }
-    if ($preset_settings['repeat']) {
+    if (isset($preset_settings['repeat']) && $preset_settings['repeat']) {
       $enabled[] = t('Repeat');
     }
-    if ($preset_settings['controls']) {
+    if (isset($preset_settings['controls']) && $preset_settings['controls']) {
       $enabled[] = t('Controls');
     }
-    if ($preset_settings['sharing']) {
+    if (isset($preset_settings['sharing']) && $preset_settings['sharing']) {
       $enabled[] = t('Sharing');
     }
     if (!empty($enabled)) {