fixes for server's serializer