[3.8] Setup fixes