More import+item fixes.