Some import improvements