Minor tweaks for populating objects