diff --git a/customize.dist/src/less2/include/modal.less b/customize.dist/src/less2/include/modal.less
index 08c0121fd..3496d8efa 100644
--- a/customize.dist/src/less2/include/modal.less
+++ b/customize.dist/src/less2/include/modal.less
@@ -59,7 +59,7 @@
             }
 
             & > p:not(.cp-modal-form) {
-                text-align: left; // XXX needs testing
+                text-align: left;
                 margin-right: 30px;
             }
 
diff --git a/lib/workers/index.js b/lib/workers/index.js
index ec06e8099..ddee0ddde 100644
--- a/lib/workers/index.js
+++ b/lib/workers/index.js
@@ -36,7 +36,7 @@ Workers.initialize = function (Env, config, _cb) {
     };
 
     const countWorkerTasks = function (/* index */) {
-        return 0; // XXX this disables all queueing until it can be proven correct
+        return 0; // FIXME this disables all queueing until it can be proven correct
         //return Object.keys(workers[index].tasks || {}).length;
     };
 
diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 4165ef009..d3c5d0e11 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -1783,9 +1783,9 @@ define([
             });
 
             if (sharedF && manager.isPathIn(newPath, [TRASH])) {
-                // XXX create a key here?
+                // TODO create a key here?
                 // You can't move to YOUR trash documents stored in a shared folder
-                // XXX or keep deletePaths: trigger the "Remove from cryptdrive" modal
+                // TODO or keep deletePaths: trigger the "Remove from cryptdrive" modal
                 return void UI.warn(Messages.error);
                 //return void deletePaths(null, movedPaths);
             }
diff --git a/www/common/outer/team.js b/www/common/outer/team.js
index 7f8d21087..2ba4e30ee 100644
--- a/www/common/outer/team.js
+++ b/www/common/outer/team.js
@@ -480,7 +480,7 @@ define([
             // Make sure we have not been kicked from the roster
             var state = roster.getState();
             var me = Util.find(ctx, ['store', 'proxy', 'curvePublic']);
-            // XXX FIXME roster history temporarily corrupted, don't leave the team
+            // FIXME roster history temporarily corrupted, don't leave the team
             if (!state.members || !Object.keys(state.members).length) {
                 lm.stop();
                 roster.stop();
@@ -488,6 +488,7 @@ define([
                 cb({error: 'EINVAL'});
                 waitFor.abort();
                 console.error(JSON.stringify(state));
+                Feedback.send("ROSTER_CORRUPTED");
                 return;
             }
             if (!state.members[me]) {
diff --git a/www/common/sframe-common.js b/www/common/sframe-common.js
index bc91c5227..8d4898911 100644
--- a/www/common/sframe-common.js
+++ b/www/common/sframe-common.js
@@ -690,7 +690,7 @@ define([
             });
 
             ctx.sframeChan.on('EV_NEW_VERSION', function () {
-                // XXX lock the UI and do the same in non-framework apps
+                // TODO lock the UI and do the same in non-framework apps
                 var $err = $('<div>').append(Messages.newVersionError);
                 $err.find('a').click(function () {
                     funcs.gotoURL();
diff --git a/www/settings/inner.js b/www/settings/inner.js
index 9f50331e3..6943f720b 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -490,8 +490,7 @@ define([
                     }, function(obj) {
                         UI.removeLoadingScreen();
                         if (obj && obj.error) {
-                            // TODO
-                            // XXX EEXISTS error message?
+                            // TODO more specific error message?
                             UI.alert(Messages.settings_changePasswordError);
                         }
                     });
diff --git a/www/teams/inner.js b/www/teams/inner.js
index 612c4517c..f2e3bf0e5 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -421,7 +421,7 @@ define([
                 common.displayAvatar($(avatar), team.metadata.avatar, team.metadata.name);
                 $(btn).click(function () {
                     if (team.error) {
-                        UI.warn(Messages.error); // XXX better error message - roster bug, can't load the team for now
+                        UI.warn(Messages.error); // FIXME better error message - roster bug, can't load the team for now
                         return;
                     }
                     openTeam(common, id, team);