Some more markup fixes