diff --git a/extra/cairo/gadgets/gadgets.factor b/extra/cairo/gadgets/gadgets.factor
index 691bcb866e..c9fef618f8 100644
--- a/extra/cairo/gadgets/gadgets.factor
+++ b/extra/cairo/gadgets/gadgets.factor
@@ -25,11 +25,11 @@ TUPLE: cairo-gadget < texture-gadget dim quot ;
 M: cairo-gadget cache-key* [ dim>> ] [ quot>> ] bi 2array ;
 
 : render-cairo ( dim quot -- bytes format )
-    >r 2^-bounds r> copy-cairo GL_BGRA ;
+    >r 2^-bounds r> copy-cairo GL_BGRA ; inline
 
-M: cairo-gadget render*
-    [ dim>> dup ] [ quot>> ] bi
-    render-cairo render-bytes* ;
+! M: cairo-gadget render*
+!     [ dim>> dup ] [ quot>> ] bi
+!     render-cairo render-bytes* ;
 
 ! maybe also texture>png
 ! : cairo>png ( gadget path -- )
diff --git a/extra/help/html/html.factor b/extra/help/html/html.factor
new file mode 100644
index 0000000000..b1bf8958a8
--- /dev/null
+++ b/extra/help/html/html.factor
@@ -0,0 +1,5 @@
+! Copyright (C) 2008 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+IN: help.html
+
+
diff --git a/extra/opengl/gadgets/gadgets-tests.factor b/extra/opengl/gadgets/gadgets-tests.factor
new file mode 100644
index 0000000000..499ec9730a
--- /dev/null
+++ b/extra/opengl/gadgets/gadgets-tests.factor
@@ -0,0 +1,4 @@
+IN: opengl.gadgets.tests
+USING: tools.test opengl.gadgets ;
+
+\ render* must-infer
diff --git a/extra/pango/cairo/cairo.factor b/extra/pango/cairo/cairo.factor
index f6c1ee498d..1ff5328ee0 100644
--- a/extra/pango/cairo/cairo.factor
+++ b/extra/pango/cairo/cairo.factor
@@ -100,7 +100,7 @@ destructors accessors namespaces kernel cairo ;
     >r alien>> pango-layout r> with-variable ; inline
 
 : with-pango-cairo ( quot -- )
-    cr pango_cairo_create_layout swap with-layout ;
+    cr pango_cairo_create_layout swap with-layout ; inline
 
 MEMO: dummy-cairo ( -- cr )
     CAIRO_FORMAT_ARGB32 0 0 cairo_image_surface_create cairo_create ;
diff --git a/extra/pango/cairo/gadgets/gadgets.factor b/extra/pango/cairo/gadgets/gadgets.factor
index 5fb579c1a1..a21affc364 100644
--- a/extra/pango/cairo/gadgets/gadgets.factor
+++ b/extra/pango/cairo/gadgets/gadgets.factor
@@ -18,7 +18,7 @@ M: pango-cairo-backend construct-pango
 
 : setup-layout ( gadget -- quot )
     [ font>> ] [ text>> ] bi
-    '[ , layout-font , layout-text ] ;
+    '[ , layout-font , layout-text ] ; inline
 
 M: pango-cairo-gadget render* ( gadget -- ) 
     setup-layout [ layout-size dup ]