removed fixes that exists in the base builder