fixes in vip (I hope)