More fixes to get views working correctly.