diff --git a/rogueviz/fifteen.cpp b/rogueviz/fifteen.cpp
index 61ef447b..6e167481 100644
--- a/rogueviz/fifteen.cpp
+++ b/rogueviz/fifteen.cpp
@@ -301,7 +301,7 @@ void launch() {
 
 void enable();
 
-void load_fifteen(fhstream& f) {
+void load_fifteen(hstream& f) {
   int num;
   f.read(num);
   fif.clear();
@@ -334,7 +334,7 @@ void o_key(o_funcs& v) {
 void enable() {
   rogueviz::rv_hook(hooks_o_key, 80, o_key);
   rogueviz::rv_hook(hooks_drawcell, 100, draw_fifteen);
-  rogueviz::rv_hook(mapstream::hooks_savemap, 100, [] (fhstream& f) {
+  rogueviz::rv_hook(mapstream::hooks_savemap, 100, [] (hstream& f) {
     f.write<int>(15);
     f.write<int>(isize(fif));
     for(auto cd: fif) {
@@ -437,7 +437,7 @@ auto fifteen_hook =
     anims::moved();
     }); })
 #endif
-+ addHook(mapstream::hooks_loadmap, 100, [] (fhstream& f, int id) {
++ addHook(mapstream::hooks_loadmap, 100, [] (hstream& f, int id) {
     if(id == 15) load_fifteen(f);
     })
 + addHook(hooks_configfile, 100, [] {
diff --git a/rogueviz/platformer.cpp b/rogueviz/platformer.cpp
index 272c67a7..8f2dbcb6 100644
--- a/rogueviz/platformer.cpp
+++ b/rogueviz/platformer.cpp
@@ -796,7 +796,7 @@ void add_platf_hooks() {
 
   rogueviz::rv_hook(hooks_drawcell, 90, draw_room_on_map);
 
-  rogueviz::rv_hook(mapstream::hooks_savemap, 100, [] (fhstream& f) {
+  rogueviz::rv_hook(mapstream::hooks_savemap, 100, [] (hstream& f) {
     f.write<int>(66);
     for(auto& p: rooms) {
       f.write(mapstream::cellids[p.first]);
@@ -835,7 +835,7 @@ auto chk = arg::add3("-platformer", enable)
           }
         });
       })
-+ addHook(mapstream::hooks_loadmap, 100, [] (fhstream& f, int id) {
++ addHook(mapstream::hooks_loadmap, 100, [] (hstream& f, int id) {
     if(id == 66) {
       println(hlog, "loading platformer");
       while(true) {
diff --git a/rogueviz/presentation.cpp b/rogueviz/presentation.cpp
index 886183fa..894db91b 100644
--- a/rogueviz/presentation.cpp
+++ b/rogueviz/presentation.cpp
@@ -487,7 +487,7 @@ int pres_hooks =
       }
     }) +
   addHook(dialog::hooks_display_dialog, 100, [] () {
-    if(current_screen_cfunction() == showMainMenu) {
+    if(current_screen_cfunction() == showGameMenu) {
       dialog::addItem(XLAT("RogueViz demos"), 'd'); 
       dialog::add_action_push(choose_presentation);
       }
diff --git a/rogueviz/smoothcam.cpp b/rogueviz/smoothcam.cpp
index 3c547c3e..07100153 100644
--- a/rogueviz/smoothcam.cpp
+++ b/rogueviz/smoothcam.cpp
@@ -571,7 +571,7 @@ void enable() {
   rogueviz::rv_hook(anims::hooks_anim, 100, handle_animation0);
   rogueviz::rv_hook(hooks_drawcell, 100, draw_labels);
   rogueviz::rv_hook(hooks_o_key, 190, [] (o_funcs& v) { v.push_back(named_dialog("smoothcam", show)); });
-  rogueviz::rv_hook(mapstream::hooks_savemap, 100, [] (fhstream& f) {
+  rogueviz::rv_hook(mapstream::hooks_savemap, 100, [] (hstream& f) {
     f.write<int>(17);
     hwrite(f, anims);
     });
@@ -598,7 +598,7 @@ auto hooks = arg::add3("-smoothcam", enable_and_show)
       dialog::add_action(enable_and_show);
       }
     }) +
-  + addHook(mapstream::hooks_loadmap, 100, [] (fhstream& f, int id) {
+  + addHook(mapstream::hooks_loadmap, 100, [] (hstream& f, int id) {
     if(id == 17) {
       enable();
       hread(f, anims);