Changes due to issue #372, new screenshots for buster-test, html2 etc.