Fixed some wonky descriptors. Fixes #164