MsfAPI fixes

a bundle of fixes for MSF API importing calls during scanner imports.