Environment variables fix