Fix courier and transportation