Fixing some issues as per Mo from VIP