vip small fixes