HTLM, merge fixes