More minor changes to markup