Handle env10 vs env4 differences