Cumulative non-DLL fixes for v2