Committing fixes for the loadshapes population code.