Fixed some geometry serialization issues