Remaining screenshot fixes.