Continued environment fixes.