diff --git a/src/components/base/CheckBox/stories.js b/src/components/base/CheckBox/stories.js
index cba1080e..fe006605 100644
--- a/src/components/base/CheckBox/stories.js
+++ b/src/components/base/CheckBox/stories.js
@@ -1,5 +1,3 @@
-// @flow
-
 import React from 'react'
 import { storiesOf } from '@storybook/react'
 import { boolean } from '@storybook/addon-knobs'
diff --git a/src/components/base/Radio/stories.js b/src/components/base/Radio/stories.js
index 2695bee4..daa31f83 100644
--- a/src/components/base/Radio/stories.js
+++ b/src/components/base/Radio/stories.js
@@ -1,5 +1,3 @@
-// @flow
-
 import React from 'react'
 import { storiesOf } from '@storybook/react'
 import { action } from '@storybook/addon-actions'
diff --git a/src/components/base/Tabs/stories.js b/src/components/base/Tabs/stories.js
index 8860631a..7f9dc543 100644
--- a/src/components/base/Tabs/stories.js
+++ b/src/components/base/Tabs/stories.js
@@ -1,5 +1,3 @@
-// @flow
-
 import React from 'react'
 
 import { number } from '@storybook/addon-knobs'
diff --git a/src/components/layout/Default.js b/src/components/layout/Default.js
index a35e0873..23b5430d 100644
--- a/src/components/layout/Default.js
+++ b/src/components/layout/Default.js
@@ -38,7 +38,9 @@ class Default extends Component<Props> {
 
   componentDidUpdate(prevProps) {
     if (this.props.location !== prevProps.location) {
-      this._scrollContainer._scrollbar.scrollTo(0, 0)
+      if (this._scrollContainer) {
+        this._scrollContainer._scrollbar.scrollTo(0, 0)
+      }
     }
   }
 
@@ -47,6 +49,7 @@ class Default extends Component<Props> {
   }
 
   _timeout = undefined
+  _scrollContainer = null
 
   render() {
     return (
diff --git a/src/renderer/createStore.js b/src/renderer/createStore.js
index 1824506c..8ad0551f 100644
--- a/src/renderer/createStore.js
+++ b/src/renderer/createStore.js
@@ -1,6 +1,6 @@
 // @flow
 
-import type { RouterHistory } from 'react-router-dom'
+import type { HashHistory } from 'history'
 
 import { createStore, applyMiddleware, compose } from 'redux'
 import { routerMiddleware } from 'react-router-redux'
@@ -10,7 +10,7 @@ import db from 'middlewares/db'
 
 import reducers from 'reducers'
 
-export default (history: RouterHistory) => {
+export default (history: HashHistory) => {
   const middlewares = [routerMiddleware(history), thunk, db]
   const enhancers = compose(
     applyMiddleware(...middlewares),