some environment update fixes