Small import improvements