Try to get environment variables correct