Fixing environemnt issues