Cleanups and environment propagation fixes.