diff --git a/src/Journals/JournalMembers.tsx b/src/Journals/JournalMembers.tsx
index a0cb01a..e2e6437 100644
--- a/src/Journals/JournalMembers.tsx
+++ b/src/Journals/JournalMembers.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import * as sjcl from 'sjcl';
+import sjcl from 'sjcl';
 
 import { List, ListItem } from '../widgets/List';
 
diff --git a/src/SyncGate.tsx b/src/SyncGate.tsx
index f4a3fb0..6457e2f 100644
--- a/src/SyncGate.tsx
+++ b/src/SyncGate.tsx
@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
 import { Action } from 'redux-actions';
 import { Route, Switch, Redirect, RouteComponentProps, withRouter } from 'react-router';
 
-import * as moment from 'moment';
+import moment from 'moment';
 import 'moment/locale/en-gb';
 
 import { List, Map } from 'immutable';
diff --git a/src/api/Crypto.test.ts b/src/api/Crypto.test.ts
index 24fcb8d..92c16ed 100644
--- a/src/api/Crypto.test.ts
+++ b/src/api/Crypto.test.ts
@@ -3,7 +3,7 @@ import { USER, PASSWORD, keyBase64 } from './TestConstants';
 
 import { stringToByteArray } from './Helpers';
 
-import * as sjcl from 'sjcl';
+import sjcl from 'sjcl';
 sjcl.random.addEntropy('seedForTheTests', 1024, 'FakeSeed');
 
 it('Derive key', () => {
diff --git a/src/api/Crypto.ts b/src/api/Crypto.ts
index 44a5448..d5fba4e 100644
--- a/src/api/Crypto.ts
+++ b/src/api/Crypto.ts
@@ -1,4 +1,4 @@
-import * as sjcl from 'sjcl';
+import sjcl from 'sjcl';
 import NodeRSA from 'node-rsa';
 
 import * as Constants from './Constants';
diff --git a/src/api/EteSync.test.ts b/src/api/EteSync.test.ts
index f9dbb77..faf56b6 100644
--- a/src/api/EteSync.test.ts
+++ b/src/api/EteSync.test.ts
@@ -1,6 +1,6 @@
 import * as EteSync from './EteSync';
 
-import * as sjcl from 'sjcl';
+import sjcl from 'sjcl';
 
 import { USER, PASSWORD, keyBase64 } from './TestConstants';
 
diff --git a/src/api/EteSync.ts b/src/api/EteSync.ts
index 9768d13..dd80782 100644
--- a/src/api/EteSync.ts
+++ b/src/api/EteSync.ts
@@ -1,4 +1,4 @@
-import * as sjcl from 'sjcl';
+import sjcl from 'sjcl';
 import URI from 'urijs';
 
 import * as Constants from './Constants';
diff --git a/src/components/Calendar.tsx b/src/components/Calendar.tsx
index 778f361..bec5c11 100644
--- a/src/components/Calendar.tsx
+++ b/src/components/Calendar.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import BigCalendar, { View } from 'react-big-calendar';
 import 'react-big-calendar/lib/css/react-big-calendar.css';
-import * as moment from 'moment';
+import moment from 'moment';
 import * as ICAL from 'ical.js';
 
 import { EventType } from '../pim-types';
diff --git a/src/widgets/PrettyFingerprint.tsx b/src/widgets/PrettyFingerprint.tsx
index 9e87986..8059b52 100644
--- a/src/widgets/PrettyFingerprint.tsx
+++ b/src/widgets/PrettyFingerprint.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import * as sjcl from 'sjcl';
+import sjcl from 'sjcl';
 
 import { byte, base64 } from '../api/Helpers';