Pedro, please check this for me and see if it's right.
It fixes 4 testsuite failures and doesn't introduce any new ones.
Michael