Fix up text/html support