Fix xenv command order