Fixed handling of environment variables and bound volumes