diff --git a/index.ts b/index.ts
deleted file mode 100644
index 7e3898fb320..00000000000
--- a/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './src/release/ng-zorro-antd.module';
diff --git a/integration/rollup/rollup.config.js b/integration/rollup/rollup.config.js
index 195d9c0a75b..c411a47eb7f 100644
--- a/integration/rollup/rollup.config.js
+++ b/integration/rollup/rollup.config.js
@@ -22,7 +22,7 @@ function enableProdMode() {
 
 
 export default {
-  input: './out-tsc/app/main.js',
+  input: './out-tsc/app/src/main.js',
   output: {
     file: './dist/main.bundle.js',
     format: 'iife',
diff --git a/integration/webpack/webpack.config.js b/integration/webpack/webpack.config.js
index d9eb9a07009..39a4592048c 100644
--- a/integration/webpack/webpack.config.js
+++ b/integration/webpack/webpack.config.js
@@ -1,7 +1,7 @@
 const path = require('path')
 const HtmlWebpackPlugin = require('html-webpack-plugin')
 const UglifyJSPlugin = require('uglifyjs-webpack-plugin')
-const { AotPlugin } = require('@ngtools/webpack')
+const { AngularCompilerPlugin } = require('@ngtools/webpack')
 const { PurifyPlugin } = require('@angular-devkit/build-optimizer')
 
 function packageSort(packages) {
@@ -49,7 +49,7 @@ module.exports = {
     extensions: ['.js', '.ts'],
   },
   plugins: [
-    new AotPlugin({
+    new AngularCompilerPlugin({
       tsConfigPath: path.resolve(__dirname, 'src/tsconfig.app.json'),
       entryModule: path.resolve(__dirname, 'src/app/app.module#AppModule'),
     }),
diff --git a/package.json b/package.json
index cf46d7bed15..04c2731153e 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,7 @@
     "typescript": "~2.4.2",
     "uglify-js": "^3.0.28",
     "web-animations-js": "^2.3.1",
-    "zone.js": "^0.8.14"
+    "zone.js": "^0.8.17"
   },
   "peerDependencies": {
     "@angular/animations": "^5.0.0",
diff --git a/src/components/message/nz-message-config.ts b/src/components/message/nz-message-config.ts
index 807aa0fc195..0ce7f74066f 100644
--- a/src/components/message/nz-message-config.ts
+++ b/src/components/message/nz-message-config.ts
@@ -7,6 +7,8 @@ export interface NzMessageConfig {
   nzAnimate?: boolean;
   // For message container only
   nzMaxStack?: number;
+
+  [index: string]: any;
 }
 
 export const NZ_MESSAGE_DEFAULT_CONFIG = new InjectionToken<NzMessageConfig>('NZ_MESSAGE_DEFAULT_CONFIG');
@@ -14,11 +16,11 @@ export const NZ_MESSAGE_DEFAULT_CONFIG = new InjectionToken<NzMessageConfig>('NZ
 export const NZ_MESSAGE_CONFIG = new InjectionToken<NzMessageConfig>('NZ_MESSAGE_CONFIG');
 
 export const NZ_MESSAGE_DEFAULT_CONFIG_PROVIDER = {
-  provide: NZ_MESSAGE_DEFAULT_CONFIG,
+  provide : NZ_MESSAGE_DEFAULT_CONFIG,
   useValue: {
-    nzDuration             : 1500,
-    nzAnimate              : true,
-    nzPauseOnHover         : true,
-    nzMaxStack             : 7,
+    nzDuration    : 1500,
+    nzAnimate     : true,
+    nzPauseOnHover: true,
+    nzMaxStack    : 7,
   }
 };
diff --git a/src/components/message/nz-message.service.ts b/src/components/message/nz-message.service.ts
index 8fceb6bfc04..3fdd6762009 100644
--- a/src/components/message/nz-message.service.ts
+++ b/src/components/message/nz-message.service.ts
@@ -1,7 +1,6 @@
-import { Injectable, ComponentRef, Type } from '@angular/core';
+import { Injectable, Type } from '@angular/core';
 import { Overlay } from '@angular/cdk/overlay';
 import { ComponentPortal } from '@angular/cdk/portal';
-import { NzMessageConfig } from './nz-message-config';
 import { NzMessageData, NzMessageDataFilled, NzMessageDataOptions } from './nz-message.definitions';
 import { NzMessageContainerComponent } from './nz-message-container.component';
 
diff --git a/src/components/notification/nz-notification.service.ts b/src/components/notification/nz-notification.service.ts
index d5db76dbb29..205abaae8c2 100644
--- a/src/components/notification/nz-notification.service.ts
+++ b/src/components/notification/nz-notification.service.ts
@@ -1,4 +1,4 @@
-import { Injectable, EventEmitter } from '@angular/core';
+import { Injectable } from '@angular/core';
 import { Overlay } from '@angular/cdk/overlay';
 import { NzNotificationData, NzNotificationDataFilled } from './nz-notification.definitions';
 import { NzMessageBaseService } from '../message/nz-message.service';
@@ -14,31 +14,31 @@ export class NzNotificationService extends NzMessageBaseService<NzNotificationCo
 
   // Shortcut methods
   success(title: string, content: string, options?: NzMessageDataOptions): NzNotificationDataFilled {
-    return this.createMessage({ type: 'success', title: title, content: content }, options);
+    return this.createMessage({ type: 'success', title: title, content: content }, options) as NzNotificationDataFilled;
   }
 
   error(title: string, content: string, options?: NzMessageDataOptions): NzNotificationDataFilled {
-    return this.createMessage({ type: 'error', title: title, content: content }, options);
+    return this.createMessage({ type: 'error', title: title, content: content }, options) as NzNotificationDataFilled;
   }
 
   info(title: string, content: string, options?: NzMessageDataOptions): NzNotificationDataFilled {
-    return this.createMessage({ type: 'info', title: title, content: content }, options);
+    return this.createMessage({ type: 'info', title: title, content: content }, options) as NzNotificationDataFilled;
   }
 
   warning(title: string, content: string, options?: NzMessageDataOptions): NzNotificationDataFilled {
-    return this.createMessage({ type: 'warning', title: title, content: content }, options);
+    return this.createMessage({ type: 'warning', title: title, content: content }, options) as NzNotificationDataFilled;
   }
 
   blank(title: string, content: string, options?: NzMessageDataOptions): NzNotificationDataFilled {
-    return this.createMessage({ type: 'blank', title: title, content: content }, options);
+    return this.createMessage({ type: 'blank', title: title, content: content }, options) as NzNotificationDataFilled;
   }
 
   create(type: string, title: string, content: string, options?: NzMessageDataOptions): NzNotificationDataFilled {
-    return this.createMessage({ type: type as any, title: title, content: content }, options);
+    return this.createMessage({ type: type as any, title: title, content: content }, options) as NzNotificationDataFilled;
   }
 
   // For content with html
   html(html: string, options?: NzMessageDataOptions): NzNotificationDataFilled {
-    return this.createMessage({ html: html }, options);
+    return this.createMessage({ html: html }, options) as NzNotificationDataFilled;
   }
 }