Fix some markup issues