More minor changes
Use our new URL identifiers