Immersive/build error fixes