Fixed some of the older Views