Fix pointers to many collections