fix build and descriptor generators