Fix Overlay and CVARS