Small hacks for Vidi…