A few changes for integrating VLD.
Misc updates.