Minor tweaks to HTML serializer