Attached is a patch to fix a couple of bugs which slipped by during
the re-integration. Also, a fix for the renamed functions in ox-html.

rick