Fixes to use Ids not URIs