diff --git a/cborg/bin.js b/cborg/bin.js
index d74924e..4e7c352 100755
--- a/cborg/bin.js
+++ b/cborg/bin.js
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 import process from 'process'
-import { decode, encode } from '../cborg.js'
+import { decode, encode } from 'cborg'
 import { tokensToDiagnostic, fromDiag } from './diagnostic.js'
 import { fromHex as _fromHex, toHex } from 'cborg/utils'
 
diff --git a/cborg/diagnostic.js b/cborg/diagnostic.js
index c596f58..2a4d907 100644
--- a/cborg/diagnostic.js
+++ b/cborg/diagnostic.js
@@ -1,6 +1,5 @@
 import { Tokeniser } from './decode.js'
-import { Type } from './token.js'
-import { uintBoundaries, toHex, fromHex } from 'cborg/utils'
+import { uintBoundaries, toHex, fromHex, Type } from 'cborg/utils'
 
 const utf8Encoder = new TextEncoder()
 const utf8Decoder = new TextDecoder()