Fix markup issues