Fixes light uniform as variable and context passing