Final environment fixes.