diff --git a/Makefile b/Makefile
index 3d5ff661..e7d36911 100644
--- a/Makefile
+++ b/Makefile
@@ -394,7 +394,7 @@ DBGFLAGS_debug = -g
 
 CFLAGS_debug += -Os -DDEBUG
 CFLAGS_release += $(CFLAGS_release_$(VARIANT))
-CFLAGS_release_dm42 = -O2
+CFLAGS_release_dm42 = -Os
 CFLAGS_release_dm32 = -O2
 CFLAGS_small += -Os
 CFLAGS_fast += -O2
diff --git a/src/user_interface.cc b/src/user_interface.cc
index 5c6ae53b..3a144abb 100644
--- a/src/user_interface.cc
+++ b/src/user_interface.cc
@@ -4201,7 +4201,10 @@ bool user_interface::handle_editing(int key)
             if (shift)
             {
                 // Shift R/S = PRGM enters a program symbol
-                edit(L'«', PROGRAM);
+                if (mode == ALGEBRAIC || mode == PARENTHESES)
+                    edit('=', ALGEBRAIC);
+                else
+                    edit(L'«', PROGRAM);
                 last = 0;
                 return true;
             }