Support reference uri & fix gobs of C code