You may need to reflash with a more current version, or look in RCS and replicate the upgrade code to your system by hand (reflashing is easier) - those bugs should be fixed.
I performed a manual upgrade last night without problems. I started with an image from Sunday the 13th, and upgraded to yesterday (17th) and it worked.
Automatic upgrade still seem to have issues, but the manual ones are fine.