diff --git a/fluid/Fl_Menu_Type.cxx b/fluid/Fl_Menu_Type.cxx
index ad6d9c6c7..5e51a6ee2 100644
--- a/fluid/Fl_Menu_Type.cxx
+++ b/fluid/Fl_Menu_Type.cxx
@@ -318,7 +318,7 @@ void Fl_Menu_Item_Type::write_item() {
     write_c(" (void*)(%s),", user_data());
   else
     write_c(" 0,");
-  write_c(" %d, %s, %d, %d, %d", flags(),
+  write_c(" %d, (uchar)%s, %d, %d, %d", flags(),
 	  labeltypes[o->labeltype()], o->labelfont(), o->labelsize(), o->labelcolor());
   write_c("},\n");
 }
diff --git a/fluid/Fl_Widget_Type.cxx b/fluid/Fl_Widget_Type.cxx
index 4a85f14c4..55152a9f3 100644
--- a/fluid/Fl_Widget_Type.cxx
+++ b/fluid/Fl_Widget_Type.cxx
@@ -2187,7 +2187,7 @@ void Fl_Widget_Type::write_code1() {
 
   indentation += 2;
 
-  if (wused) write_c("%sw = o;\n", indent());
+  if (wused) write_c("%sw = o; if (w) {/* empty */}\n", indent());
 
   write_widget_code();
 }