envrionment fixes