More fixes to XXX view