Suggestions for 9.8.

(Sorry that the commits for 9.7. also turn up in this PR - I dont know where I went wrong - but I dont want to sort out that probel. I hope you can live with it ...).