Fix label/serialization stuff