diff --git a/src/FbRootWindow.cc b/src/FbRootWindow.cc
index 0cd730e1..d17d56f1 100644
--- a/src/FbRootWindow.cc
+++ b/src/FbRootWindow.cc
@@ -74,6 +74,6 @@ FbRootWindow::FbRootWindow(int screen_num):
         m_colormap = XCreateColormap(disp, window(), m_visual, AllocNone);
     }
     if (m_decorationVisual != DefaultVisual(disp, screen_num)) {
-        m_decorationColormap = XCreateColormap(disp, window(), m_visual, AllocNone);
+        m_decorationColormap = XCreateColormap(disp, window(), m_decorationVisual, AllocNone);
     }
 }
diff --git a/src/Remember.cc b/src/Remember.cc
index acbbddfb..77cc889f 100644
--- a/src/Remember.cc
+++ b/src/Remember.cc
@@ -247,6 +247,7 @@ string escapeRememberChars(const string& str) {
                 escaped_str += '\\';
             default:
                 escaped_str += *i;
+                break;
         }
     }
 
@@ -982,7 +983,7 @@ void Remember::save() {
             case (WindowState::DECOR_BORDER):
                 apps_file << "  [Deco]\t{BORDER}" << endl;
                 break;
-            case (WindowState::DECORM_TAB):
+            case (WindowState::DECOR_TAB):
                 apps_file << "  [Deco]\t{TAB}" << endl;
                 break;
             default: