Screenshot and highlighting issue fix.