Fixing errors due to new collections system