Sync env before trip (minor additions)