Well I had rebuilt all the metadata right before the upgrade, just in case. Will try again with the fix you suggested.