Fix dvar restriction stuff