Use correct environment switches