Fixed some bugs with the new serializer