diff --git a/common.inc b/common.inc
index 082569a..e1d4044 100644
--- a/common.inc
+++ b/common.inc
@@ -395,8 +395,10 @@
     } if
 
     video_modes.selected.append .undef ne {
-      calculate.param
-      video_modes.selected.append "%s" bc.cmd dup length add sprintf
+      video_modes.selected.append 0 get 0 ne {
+          calculate.param
+          video_modes.selected.append "%s" bc.cmd dup length add sprintf
+      } if
     } if
 
     fulloptions.cmd_composite dup 0 get 0 ne {
diff --git a/dia_fulloptions.inc b/dia_fulloptions.inc
index a642425..20100a0 100644
--- a/dia_fulloptions.inc
+++ b/dia_fulloptions.inc
@@ -222,6 +222,6 @@
 %
 /fulloptions.cmd_composite {
   fulloptions.label_no_composite {
-     xmenu.fulloptions .xm_allselected get .fulloptions.nocomposite get { "composite:on" } { "composite:off" } ifelse
+     xmenu.fulloptions .xm_allselected get .fulloptions.nocomposite get { "composite:off" } { "" } ifelse
   } { "" } ifelse
 } def