small tweaks to import base