Slightly increased OSX support (shaders primarily)