Small fixes for environment