URL and markup corrections