Updates to keep in synch with Vitro/VIVO changes