more tweaks for the serializer