Catchup on some more screenshot changes.