Image markup fixes.