diff --git a/projects/asciilib/src/asciilib/Colors.kiss b/projects/asciilib/src/asciilib/Colors.kiss
index 5d6e7ea1..8ab79ee7 100644
--- a/projects/asciilib/src/asciilib/Colors.kiss
+++ b/projects/asciilib/src/asciilib/Colors.kiss
@@ -16,7 +16,7 @@
 (method _index [x y]
     (+ x (* y width)))
 
-(defmacro withIndex [idxName xName yName &body body]
+(defMacro withIndex [idxName xName yName &body body]
     `(let [,idxName (_index ,xName ,yName)]
         ,@body))
 
diff --git a/projects/asciilib/src/asciilib/Surface.kiss b/projects/asciilib/src/asciilib/Surface.kiss
index d78b3605..57df7cbd 100644
--- a/projects/asciilib/src/asciilib/Surface.kiss
+++ b/projects/asciilib/src/asciilib/Surface.kiss
@@ -59,16 +59,15 @@
                 ((Some colorLine)
                     (let [[symbol _r _g _b] (colorLine.split " ")]
                         (dictSet colors symbol (object r (Std.parseInt _r) g (Std.parseInt _g) b (Std.parseInt _b)))))
-                (None (throw "Expected INFO CODES in Surface"))))
+                (otherwise (throw "Expected INFO CODES in Surface"))))
         (loop
             (case (stream.takeLine)
                 ((Some "SIZE") (break))
                 ((Some infoLine)
                     (let [infoTokens (infoLine.split " ")]
                         (dictSet infoCodes (infoTokens.shift) (infoTokens.join " "))))
-                (None (throw "Expected SIZE in Surface"))))
+                (otherwise (throw "Expected SIZE in Surface"))))
         (case (stream.takeLine)
-            (None (throw "expected [width] [height] in Surface"))
             ((Some sizeLine)
                 (let [[width height] (.map (sizeLine.split " ") Std.parseInt)
                         surface (new Surface width height)]
@@ -95,4 +94,5 @@
                         (doFor x (range width)
                             (surface.specialInfo.setCell x y (dictGet infoCodes (stream.expect "a special info code" ->{(stream.takeChars 1)}))))
                         (stream.dropString "\n"))
-                    surface)))))
+                    surface))
+            (otherwise (throw "expected [width] [height] in Surface")))))