Fix errors from variant type namespace thing