Fixed serialization errors