For the databases, just sync once with emplode after doing the upgrade -- this should fix them. (worked for v3alpha3, anyways).

Cheers