#835: Fix errors with Descriptors during a run