Final environment changes for forge