Fixes carried over from Skybox.