Updates to population synthesis - fixes for container prototypes.