Minor tweaks and corrections
Use INTEGRATION_* instead of flavor-specific ENV vars