Fixed serializer issues.