Fixed up some envionrment variables