diff --git a/package.nw/lib/roster/renderNormalRoster.js b/package.nw/lib/roster/renderNormalRoster.js
index 80fa5a84..3174d252 100644
--- a/package.nw/lib/roster/renderNormalRoster.js
+++ b/package.nw/lib/roster/renderNormalRoster.js
@@ -1,4 +1,4 @@
-function renderNormalRosterHeaders()
+function renderNormalRosterHeaders(showBands, showModes)
 {
   var worker = ""
   worker = "<table id='callTable' class='rosterTable' align=left>";
diff --git a/package.nw/lib/roster/renderRoster.js b/package.nw/lib/roster/renderRoster.js
index d245b2dc..cc8f4b9a 100644
--- a/package.nw/lib/roster/renderRoster.js
+++ b/package.nw/lib/roster/renderRoster.js
@@ -65,7 +65,7 @@ function renderRoster(callRoster, rosterSettings)
   var showBands = (Object.keys(rosterSettings.bands).length > 1) || g_rosterSettings.columns.Band;
   var showModes = (Object.keys(rosterSettings.modes).length > 1) || g_rosterSettings.columns.Mode;
 
-  var worker = g_rosterSettings.compact ? renderCompactRosterHeaders() : renderNormalRosterHeaders()
+  var worker = g_rosterSettings.compact ? renderCompactRosterHeaders() : renderNormalRosterHeaders(showBands, showModes)
 
   // Third loop: render all rows
   for (var x in visibleCallList)
diff --git a/package.nw/lib/roster/sendAlerts.js b/package.nw/lib/roster/sendAlerts.js
index 7dcfa0f2..99a31889 100644
--- a/package.nw/lib/roster/sendAlerts.js
+++ b/package.nw/lib/roster/sendAlerts.js
@@ -29,7 +29,7 @@ function sendAlerts(callRoster, rosterSettings)
     delete g_scriptReport[call].qso;
     delete g_scriptReport[call].instance;
 
-    if (callMode != "all")
+    if (rosterSettings.callMode != "all")
     {
       g_scriptReport[call].shouldAlert = true;
       g_scriptReport[call].reason.push(g_rosterSettings.hunting);
@@ -38,7 +38,7 @@ function sendAlerts(callRoster, rosterSettings)
 
   if (
     callObj.alerted == false &&
-      callMode == "all" &&
+      rosterSettings.callMode == "all" &&
       callObj.shouldAlert == true
   )
   {