Bug fixes in Builder with descriptors