Fixing some markup