LilVendor / Virags integration fixes