Minor tweaks for recursive importing