Fix up some plugin descriptor/handle skank