Clean up for extra::url fixes