More improvements for new screenshots.