Fix: More fixes for XHTML support