Minor tweaks involving import changes.