Changed some environment forms