Fix registration descriptors