Fix some VIP bugs