A few markup fixes