Fix/descriptor serialization