Fixes to collection view controllers