fixes to env