More minor mark-up fixes