Many changes to get clusters working.