More fixes in views