Patches attached, two of which fix regressions. I will apply these two
tonight unless there are objections.

- Andreas