Further import improvements and some fixes.