Fix some env things