[OE-3624] Minor markup fixes
General markup related fixes