diff --git a/ion/test/events.cpp b/ion/test/events.cpp
index 0c3fd3298..8dbe9bde9 100644
--- a/ion/test/events.cpp
+++ b/ion/test/events.cpp
@@ -18,7 +18,7 @@ QUIZ_CASE(ion_events_from_keyboard) {
 
   // Test some fallbacks
   quiz_assert(Event(Key::EXE, false, false, false) == EXE);
-  quiz_assert(Event(Key::EXE, true, false, false) == EXE);
+  quiz_assert(Event(Key::EXE, true, false, false) == ShiftEXE);
   quiz_assert(Event(Key::EXE, false, true, false) == EXE);
   quiz_assert(Event(Key::EXE, true, true, false) == EXE);
   quiz_assert(Event(Key::EXE, false, true, true) == EXE);
diff --git a/kandinsky/include/kandinsky/font.h b/kandinsky/include/kandinsky/font.h
index 3195d0180..2b7921cce 100644
--- a/kandinsky/include/kandinsky/font.h
+++ b/kandinsky/include/kandinsky/font.h
@@ -61,7 +61,7 @@ public:
     CodePoint m_codePoint;
     GlyphIndex m_glyphIndex;
   };
-  static constexpr GlyphIndex IndexForReplacementCharacterCodePoint = 134;
+  static constexpr GlyphIndex IndexForReplacementCharacterCodePoint = 190;
   GlyphIndex indexForCodePoint(CodePoint c) const;
 
   void setGlyphGrayscalesForCodePoint(CodePoint codePoint, GlyphBuffer * glyphBuffer) const;
diff --git a/kandinsky/src/font.cpp b/kandinsky/src/font.cpp
index a1d217521..67d39383b 100644
--- a/kandinsky/src/font.cpp
+++ b/kandinsky/src/font.cpp
@@ -155,7 +155,7 @@ KDFont::GlyphIndex KDFont::indexForCodePoint(CodePoint c) const {
     return endPair->glyphIndex();
   }
   NoMatchingGlyph:
-  assert(SimpleCodePoints[IndexForReplacementCharacterCodePoint] == 0xFFFD);
+  assert(ExtendedCodePoints[IndexForReplacementCharacterCodePoint] == 0xFFFD);
   return IndexForReplacementCharacterCodePoint;
 #endif
 }