Revert "some fixes"

This reverts commit 16df29802666c296db4e197b9932c8fc428e073c.
descriptor fixes