fixes to make lazy collection view work