extra checking
More fixing of URI manufacturing.