[[ RefactorGraphics ]] [[ Bug 11175 ]] fix compile errors from previous commit