environment fixes