Use proper environment variables in some more sets