Fix shader errors on Mac
Merge branch 'ui' into strip