Further fixes for HTML m to s