Fix factories to prevent overlap validation error