Fixes for running multiple descriptors