Fixing some markups