Fixes for CVREF rendering on osx