Fixes from Thierry on the trunk.