Fixes for non-GL builds