Fix VIP MVC end issues