Fix envsetup to use export