Assorted markup fixes