Some additional view fix