Fixes according to review comments
Finished feature 58802430/screenscraping-broken.