Fixes for doctype=html