tweaks to get type importing working..?