diff --git a/package.json b/package.json
index d68818f..a7973b9 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,10 @@
   "author": "Thiago Zanivan <hi+github@thiagozf.com>",
   "repository": {
     "type": "git",
-    "url": ""
+    "url": "https://github.com/thiagozf/rimo.git"
+  },
+  "bugs": {
+    "url": "https://github.com/thiagozf/rimo/issues"
   },
   "license": "MIT",
   "engines": {
diff --git a/rollup.config.ts b/rollup.config.ts
index 2990ad3..0008d34 100644
--- a/rollup.config.ts
+++ b/rollup.config.ts
@@ -26,7 +26,11 @@ export default {
     // Compile TypeScript files
     typescript({ useTsconfigDeclarationDir: true }),
     // Allow bundling cjs modules (unlike webpack, rollup doesn't understand cjs)
-    commonjs(),
+    commonjs({
+      namedExports: {
+        'node_modules/lodash/lodash.js': ['cloneDeep', 'isEqual'],
+      },
+    }),
     // Allow node_modules resolution, so you can use 'external' to control
     // which external modules to include in the bundle
     // https://github.com/rollup/rollup-plugin-node-resolve#usage
diff --git a/src/EntityId.ts b/src/EntityId.ts
index 5b672c9..859e1fb 100644
--- a/src/EntityId.ts
+++ b/src/EntityId.ts
@@ -1,4 +1,4 @@
-import * as shortid from 'shortid'
+import shortid from 'shortid'
 import { Identifier, PrimitiveIdentifier } from './Identifier'
 
 /**
diff --git a/src/ValueObject.ts b/src/ValueObject.ts
index 1814fed..1adf752 100644
--- a/src/ValueObject.ts
+++ b/src/ValueObject.ts
@@ -1,4 +1,4 @@
-import { cloneDeep, isEqual } from 'lodash'
+import { isEqual, cloneDeep } from 'lodash'
 import { Object } from './Object'
 
 /**
diff --git a/tools/gh-pages-publish.ts b/tools/gh-pages-publish.ts
index 9e56dac..62d2990 100644
--- a/tools/gh-pages-publish.ts
+++ b/tools/gh-pages-publish.ts
@@ -15,7 +15,7 @@ if (typeof pkg.repository === 'object') {
 
 let parsedUrl = url.parse(repoUrl)
 let repository = (parsedUrl.host || '') + (parsedUrl.path || '')
-let ghToken = process.env.GH_TOKEN
+let ghToken = process.env.GH_TOKEN || process.env.GITHUB_TOKEN
 
 echo('Deploying docs!')
 cd('docs')
diff --git a/tsconfig.json b/tsconfig.json
index 215a7f1..9d0f422 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,21 +2,18 @@
   "compilerOptions": {
     "moduleResolution": "node",
     "target": "es5",
-    "module":"es2015",
+    "module": "es2015",
     "lib": ["es2015", "es2016", "es2017", "dom"],
     "strict": true,
     "sourceMap": true,
     "declaration": true,
     "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true,
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
     "declarationDir": "dist/types",
     "outDir": "dist/lib",
-    "typeRoots": [
-      "node_modules/@types"
-    ]
+    "typeRoots": ["node_modules/@types"]
   },
-  "include": [
-    "src"
-  ]
+  "include": ["src"]
 }