some temporary fixes to environment stuff