vartree fixes for justin