7 files changed, 8 insertions, 7 deletions
diff --git a/packages/contract_templates/partials/callAsync.handlebars b/packages/contract_templates/partials/callAsync.handlebars
index 904936173..71c43eb18 100644
--- a/packages/contract_templates/partials/callAsync.handlebars
+++ b/packages/contract_templates/partials/callAsync.handlebars
@@ -16,7 +16,7 @@ async callAsync(
         {
             data: encodedData,
         },
-        this._web3Wrapper.getContractDefaults(),
+        self._web3Wrapper.getContractDefaults(),
     )
     const rawCallResult = await self._web3Wrapper.callAsync(callDataWithDefaults, defaultBlock);
     let resultArray = ethersFunction.parse(rawCallResult);
diff --git a/packages/contract_templates/partials/tx.handlebars b/packages/contract_templates/partials/tx.handlebars
index f72078a4e..23bafd869 100644
--- a/packages/contract_templates/partials/tx.handlebars
+++ b/packages/contract_templates/partials/tx.handlebars
@@ -19,7 +19,7 @@ public {{this.tsName}} = {
                 ...txData,
                 data: encodedData,
             },
-            this._web3Wrapper.getContractDefaults(),
+            self._web3Wrapper.getContractDefaults(),
             self.{{this.tsName}}.estimateGasAsync.bind(
                 self,
                 {{> params inputs=inputs}}
@@ -43,7 +43,7 @@ public {{this.tsName}} = {
                 ...txData,
                 data: encodedData,
             },
-            this._web3Wrapper.getContractDefaults(),
+            self._web3Wrapper.getContractDefaults(),
         );
         const gas = await self._web3Wrapper.estimateGasAsync(txDataWithDefaults);
         return gas;
diff --git a/packages/metacoin/test/utils/config.ts b/packages/metacoin/test/utils/config.ts
index 8ae6d39a2..389edb388 100644
--- a/packages/metacoin/test/utils/config.ts
+++ b/packages/metacoin/test/utils/config.ts
@@ -6,7 +6,7 @@ export const config = {
     artifactsDir: path.resolve(__dirname, '../../artifacts'),
     contractsDir: path.resolve(__dirname, '../../contracts'),
     ganacheLogFile: 'ganache.log',
-    defaults: {
+    txDefaults: {
         from: devConstants.TESTRPC_FIRST_ADDRESS,
     },
     mnemonic: 'concert load couple harbor equip island argue ramp clarify fence smart topic',
diff --git a/packages/migrations/src/migrate.ts b/packages/migrations/src/migrate.ts
index fe3daed98..b00ba698f 100644
--- a/packages/migrations/src/migrate.ts
+++ b/packages/migrations/src/migrate.ts
@@ -7,7 +7,7 @@ import * as path from 'path';
 import { runMigrationsAsync } from './migration';
 
 (async () => {
-    const defaults = {
+    const txDefaults = {
         from: devConstants.TESTRPC_FIRST_ADDRESS,
     };
     const providerConfigs = { shouldUseInProcessGanache: false };
diff --git a/packages/migrations/src/migration.ts b/packages/migrations/src/migration.ts
index 2e38b59ae..96973fb62 100644
--- a/packages/migrations/src/migration.ts
+++ b/packages/migrations/src/migration.ts
@@ -3,7 +3,8 @@ import { BigNumber, NULL_BYTES } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import * as _ from 'lodash';
 
-import { artifacts, ArtifactWriter } from './artifacts';
+import { ArtifactWriter } from './artifact_writer';
+import { artifacts } from './artifacts';
 import { DummyTokenContract } from './contract_wrappers/dummy_token';
 import { ExchangeContract } from './contract_wrappers/exchange';
 import { MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddressContract } from './contract_wrappers/multi_sig_wallet_with_time_lock_except_remove_authorized_address';
diff --git a/packages/sol-compiler/solc_bin/.gitkeep b/packages/sol-compiler/solc_bin/.gitkeep
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/packages/sol-compiler/solc_bin/.gitkeep
diff --git a/packages/website/ts/components/top_bar/top_bar.tsx b/packages/website/ts/components/top_bar/top_bar.tsx
index 23130853c..5a1b50310 100644
--- a/packages/website/ts/components/top_bar/top_bar.tsx
+++ b/packages/website/ts/components/top_bar/top_bar.tsx
@@ -390,7 +390,7 @@ export class TopBar extends React.Component<TopBarProps, TopBarState> {
             (!this._isViewing0xjsDocs() &&
                 !this._isViewingSmartContractsDocs() &&
                 !this._isViewingWeb3WrapperDocs() &&
-                !this._isViewingDeployerDocs() &&
+                !this._isViewingSolCompilerDocs() &&
                 !this._isViewingJsonSchemasDocs() &&
                 !this._isViewingSolCovDocs() &&
                 !this._isViewingSubprovidersDocs() &&