Fixing some minor markup issues