FLOE-215: Some mark-up fixes