Final changes to get import scripts working.