fixes for the evironment variables