A couple slight gets added to Environment. Not making big changes there.