diff --git a/src/api/Crypto.ts b/src/api/Crypto.ts
index 2fb717e..18a4d62 100644
--- a/src/api/Crypto.ts
+++ b/src/api/Crypto.ts
@@ -1,5 +1,5 @@
 import * as sjcl from 'sjcl';
-import * as NodeRSA from 'node-rsa';
+import NodeRSA from 'node-rsa';
 
 import * as Constants from './Constants';
 import { byte, base64 } from './Helpers';
diff --git a/src/api/EteSync.ts b/src/api/EteSync.ts
index eba0bb9..a6a3709 100644
--- a/src/api/EteSync.ts
+++ b/src/api/EteSync.ts
@@ -1,9 +1,9 @@
 import * as sjcl from 'sjcl';
-import * as URI from 'urijs';
+import URI from 'urijs';
 
 import * as Constants from './Constants';
 
-import * as fetch from 'isomorphic-fetch';
+import fetch from 'isomorphic-fetch';
 
 import { byte, base64, stringToByteArray } from './Helpers';
 import { CryptoManager, AsymmetricKeyPair, HMAC_SIZE_BYTES } from './Crypto';
diff --git a/src/components/Contact.tsx b/src/components/Contact.tsx
index 70e5670..afb5fde 100644
--- a/src/components/Contact.tsx
+++ b/src/components/Contact.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import * as moment from 'moment';
+import moment from 'moment';
 
 import { List, ListItem, ListDivider as Divider } from '../widgets/List';
 import IconHome from '@material-ui/icons/Home';
diff --git a/src/components/Event.tsx b/src/components/Event.tsx
index adf8908..afb643d 100644
--- a/src/components/Event.tsx
+++ b/src/components/Event.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import * as moment from 'moment';
+import moment from 'moment';
 
 import PimItemHeader from './PimItemHeader';
 
diff --git a/src/store/index.ts b/src/store/index.ts
index 99c25fe..51442c2 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -8,8 +8,8 @@ import promiseMiddleware from './promise-middleware';
 import reducers from './reducers';
 import { CredentialsTypeRemote, JournalsType, EntriesType, UserInfoType } from './reducers';
 
-export { CredentialsType, CredentialsData, JournalsType, JournalsData,
-  EntriesType, EntriesData, UserInfoType, UserInfoData } from './reducers';
+// Workaround babel limitation
+export * from './reducers';
 
 export interface StoreState {
   fetchCount: number;
diff --git a/src/widgets/DateTimePicker.tsx b/src/widgets/DateTimePicker.tsx
index 4ad07b9..77d6ba7 100644
--- a/src/widgets/DateTimePicker.tsx
+++ b/src/widgets/DateTimePicker.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 
-import * as moment from 'moment';
-import * as Datetime from 'react-datetime';
+import moment from 'moment';
+import Datetime from 'react-datetime';
 
 import 'react-datetime/css/react-datetime.css';