Fixes in builder and extenders