Fixed overflow and UID in cluster definitions