diff --git a/ng2-components/ng2-alfresco-core/config/webpack.common.js b/ng2-components/ng2-alfresco-core/config/webpack.common.js
index ec5449b974..c834b2281c 100644
--- a/ng2-components/ng2-alfresco-core/config/webpack.common.js
+++ b/ng2-components/ng2-alfresco-core/config/webpack.common.js
@@ -39,7 +39,8 @@ module.exports = {
                 loader: 'tslint-loader',
                 options: {
                     emitErrors: true,
-                    failOnHint: true
+                    failOnHint: true,
+                    fix: true
                 },
                 exclude: [/node_modules/, /bundles/, /dist/, /demo/]
             },
diff --git a/ng2-components/ng2-alfresco-core/src/components/view/card-view-dateitem.component.spec.ts b/ng2-components/ng2-alfresco-core/src/components/view/card-view-dateitem.component.spec.ts
index a1b3dfdfb3..2590ab9775 100644
--- a/ng2-components/ng2-alfresco-core/src/components/view/card-view-dateitem.component.spec.ts
+++ b/ng2-components/ng2-alfresco-core/src/components/view/card-view-dateitem.component.spec.ts
@@ -46,7 +46,7 @@ describe('CardViewDateItemComponent', () => {
     beforeEach(() => {
         fixture = TestBed.createComponent(CardViewDateItemComponent);
         component = fixture.componentInstance;
-        component.property = <CardViewDateItemModel>{
+        component.property = <CardViewDateItemModel> {
             type: 'date',
             label: 'Date label',
             value: new Date('07/10/2017'),
diff --git a/ng2-components/ng2-alfresco-core/src/components/view/card-view-item-dispatcher.component.spec.ts b/ng2-components/ng2-alfresco-core/src/components/view/card-view-item-dispatcher.component.spec.ts
index 67d2e7ca55..7ce4e271dd 100644
--- a/ng2-components/ng2-alfresco-core/src/components/view/card-view-item-dispatcher.component.spec.ts
+++ b/ng2-components/ng2-alfresco-core/src/components/view/card-view-item-dispatcher.component.spec.ts
@@ -62,7 +62,7 @@ describe('CardViewItemDispatcherComponent', () => {
     beforeEach(() => {
         fixture = TestBed.createComponent(CardViewItemDispatcherComponent);
         component = fixture.componentInstance;
-        component.property = <CardViewItem>{
+        component.property = <CardViewItem> {
             type: 'shiny-custom-element',
             label: 'Shiny custom element',
             value: null,
diff --git a/ng2-components/ng2-alfresco-core/src/components/view/card-view-textitem.component.spec.ts b/ng2-components/ng2-alfresco-core/src/components/view/card-view-textitem.component.spec.ts
index 9de4d2580f..ecef3b4a5c 100644
--- a/ng2-components/ng2-alfresco-core/src/components/view/card-view-textitem.component.spec.ts
+++ b/ng2-components/ng2-alfresco-core/src/components/view/card-view-textitem.component.spec.ts
@@ -51,7 +51,7 @@ describe('CardViewTextItemComponent', () => {
     beforeEach(() => {
         fixture = TestBed.createComponent(CardViewTextItemComponent);
         component = fixture.componentInstance;
-        component.property = <CardViewTextItemModel>{
+        component.property = <CardViewTextItemModel> {
             type: 'text',
             label: 'Text label',
             value: 'Lorem ipsum',
diff --git a/ng2-components/ng2-alfresco-core/src/directives/upload.directive.spec.ts b/ng2-components/ng2-alfresco-core/src/directives/upload.directive.spec.ts
index 3fc96a8f9d..292ccac759 100644
--- a/ng2-components/ng2-alfresco-core/src/directives/upload.directive.spec.ts
+++ b/ng2-components/ng2-alfresco-core/src/directives/upload.directive.spec.ts
@@ -89,21 +89,21 @@ describe('UploadDirective', () => {
     it('should prevent default event on drop', () => {
         directive.enabled = true;
         let event = jasmine.createSpyObj('event', ['preventDefault', 'stopPropagation']);
-        directive.onDrop(<DragEvent>event);
+        directive.onDrop(<DragEvent> event);
         expect(event.preventDefault).toHaveBeenCalled();
     });
 
     it('should stop default event propagation on drop', () => {
         directive.enabled = true;
         let event = jasmine.createSpyObj('event', ['preventDefault', 'stopPropagation']);
-        directive.onDrop(<DragEvent>event);
+        directive.onDrop(<DragEvent> event);
         expect(event.stopPropagation).toHaveBeenCalled();
     });
 
     it('should not prevent default event on drop when disabled', () => {
         directive.enabled = false;
         let event = jasmine.createSpyObj('event', ['preventDefault', 'stopPropagation']);
-        directive.onDrop(<DragEvent>event);
+        directive.onDrop(<DragEvent> event);
         expect(event.preventDefault).not.toHaveBeenCalled();
     });
 
diff --git a/ng2-components/ng2-alfresco-core/src/services/alfresco-content.service.spec.ts b/ng2-components/ng2-alfresco-core/src/services/alfresco-content.service.spec.ts
index cbbb4be902..c6bc7b9c68 100644
--- a/ng2-components/ng2-alfresco-core/src/services/alfresco-content.service.spec.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/alfresco-content.service.spec.ts
@@ -18,10 +18,10 @@
 import { async, TestBed } from '@angular/core/testing';
 import { CookieServiceMock } from './../assets/cookie.service.mock';
 import { AlfrescoApiService } from './alfresco-api.service';
-import { AuthenticationService } from './authentication.service';
 import { AlfrescoContentService } from './alfresco-content.service';
 import { AlfrescoSettingsService } from './alfresco-settings.service';
 import { AppConfigModule } from './app-config.service';
+import { AuthenticationService } from './authentication.service';
 import { CookieService } from './cookie.service';
 import { LogService } from './log.service';
 import { StorageService } from './storage.service';
diff --git a/ng2-components/ng2-alfresco-core/src/services/auth-guard-bpm.service.spec.ts b/ng2-components/ng2-alfresco-core/src/services/auth-guard-bpm.service.spec.ts
index 08753df950..25029a0702 100644
--- a/ng2-components/ng2-alfresco-core/src/services/auth-guard-bpm.service.spec.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/auth-guard-bpm.service.spec.ts
@@ -16,15 +16,15 @@
  */
 
 import { async, inject, TestBed } from '@angular/core/testing';
-import { Router} from '@angular/router';
+import { Router } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 
 import { CookieServiceMock } from './../assets/cookie.service.mock';
 import { AlfrescoApiService } from './alfresco-api.service';
-import { AuthenticationService } from './authentication.service';
 import { AlfrescoSettingsService } from './alfresco-settings.service';
 import { AppConfigModule } from './app-config.service';
 import { AuthGuardBpm } from './auth-guard-bpm.service';
+import { AuthenticationService } from './authentication.service';
 import { CookieService } from './cookie.service';
 import { LogService } from './log.service';
 import { StorageService } from './storage.service';
diff --git a/ng2-components/ng2-alfresco-core/src/services/auth-guard-ecm.service.spec.ts b/ng2-components/ng2-alfresco-core/src/services/auth-guard-ecm.service.spec.ts
index d7489bb0f2..c6d7da6100 100644
--- a/ng2-components/ng2-alfresco-core/src/services/auth-guard-ecm.service.spec.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/auth-guard-ecm.service.spec.ts
@@ -16,15 +16,15 @@
  */
 
 import { async, inject, TestBed } from '@angular/core/testing';
-import { Router} from '@angular/router';
+import { Router } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 
 import { CookieServiceMock } from './../assets/cookie.service.mock';
 import { AlfrescoApiService } from './alfresco-api.service';
-import { AuthenticationService } from './authentication.service';
 import { AlfrescoSettingsService } from './alfresco-settings.service';
 import { AppConfigModule } from './app-config.service';
 import { AuthGuardEcm } from './auth-guard-ecm.service';
+import { AuthenticationService } from './authentication.service';
 import { CookieService } from './cookie.service';
 import { LogService } from './log.service';
 import { StorageService } from './storage.service';
diff --git a/ng2-components/ng2-alfresco-core/src/services/auth-guard.service.spec.ts b/ng2-components/ng2-alfresco-core/src/services/auth-guard.service.spec.ts
index 92f860f5ec..c465f6cfa0 100644
--- a/ng2-components/ng2-alfresco-core/src/services/auth-guard.service.spec.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/auth-guard.service.spec.ts
@@ -16,15 +16,15 @@
  */
 
 import { async, inject, TestBed } from '@angular/core/testing';
-import { Router} from '@angular/router';
+import { Router } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 
 import { CookieServiceMock } from './../assets/cookie.service.mock';
 import { AlfrescoApiService } from './alfresco-api.service';
-import { AuthenticationService } from './authentication.service';
 import { AlfrescoSettingsService } from './alfresco-settings.service';
 import { AppConfigModule } from './app-config.service';
 import { AuthGuard } from './auth-guard.service';
+import { AuthenticationService } from './authentication.service';
 import { CookieService } from './cookie.service';
 import { LogService } from './log.service';
 import { StorageService } from './storage.service';
diff --git a/ng2-components/ng2-alfresco-core/src/services/authentication.service.spec.ts b/ng2-components/ng2-alfresco-core/src/services/authentication.service.spec.ts
index 8b70bdcbf4..0b884c620c 100644
--- a/ng2-components/ng2-alfresco-core/src/services/authentication.service.spec.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/authentication.service.spec.ts
@@ -18,9 +18,9 @@
 import { async, TestBed } from '@angular/core/testing';
 import { CookieServiceMock } from './../assets/cookie.service.mock';
 import { AlfrescoApiService } from './alfresco-api.service';
-import { AuthenticationService } from './authentication.service';
 import { AlfrescoSettingsService } from './alfresco-settings.service';
 import { AppConfigModule } from './app-config.service';
+import { AuthenticationService } from './authentication.service';
 import { CookieService } from './cookie.service';
 import { LogService } from './log.service';
 import { StorageService } from './storage.service';
diff --git a/ng2-components/ng2-alfresco-core/src/services/thumbnail.service.spec.ts b/ng2-components/ng2-alfresco-core/src/services/thumbnail.service.spec.ts
index 575a19d3b8..71f159f580 100644
--- a/ng2-components/ng2-alfresco-core/src/services/thumbnail.service.spec.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/thumbnail.service.spec.ts
@@ -19,10 +19,10 @@ import { async, TestBed } from '@angular/core/testing';
 import { HttpModule } from '@angular/http';
 import { CookieServiceMock } from './../assets/cookie.service.mock';
 import { AlfrescoApiService } from './alfresco-api.service';
-import { AuthenticationService } from './authentication.service';
 import { AlfrescoContentService } from './alfresco-content.service';
 import { AlfrescoSettingsService } from './alfresco-settings.service';
 import { AppConfigService } from './app-config.service';
+import { AuthenticationService } from './authentication.service';
 import { CookieService } from './cookie.service';
 import { LogService } from './log.service';
 import { StorageService } from './storage.service';
diff --git a/ng2-components/ng2-alfresco-core/src/services/translate-loader.spec.ts b/ng2-components/ng2-alfresco-core/src/services/translate-loader.spec.ts
index 9db5ca49a0..9ec37405b5 100644
--- a/ng2-components/ng2-alfresco-core/src/services/translate-loader.spec.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/translate-loader.spec.ts
@@ -16,14 +16,14 @@
  */
 
 import { Injector } from '@angular/core';
-import {getTestBed, TestBed} from '@angular/core/testing';
+import { getTestBed, TestBed } from '@angular/core/testing';
 import { HttpModule, Response, ResponseOptions, XHRBackend } from '@angular/http';
 import { MockBackend, MockConnection } from '@angular/http/testing';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
+import { LogService } from './log.service';
 import { AlfrescoTranslateLoader } from './translate-loader.service';
 import { TranslationService } from './translation.service';
-import { LogService } from './log.service';
 
 let componentJson1 = ' {"TEST": "This is a test", "TEST2": "This is another test"} ' ;
 
diff --git a/ng2-components/ng2-alfresco-core/src/services/translation.service.spec.ts b/ng2-components/ng2-alfresco-core/src/services/translation.service.spec.ts
index 9a7003c142..ab1a87afa7 100644
--- a/ng2-components/ng2-alfresco-core/src/services/translation.service.spec.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/translation.service.spec.ts
@@ -21,9 +21,9 @@ import { HttpModule, Response, ResponseOptions, XHRBackend } from '@angular/http
 import { MockBackend, MockConnection } from '@angular/http/testing';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
+import { LogService } from './log.service';
 import { AlfrescoTranslateLoader } from './translate-loader.service';
 import { TranslationService } from './translation.service';
-import { LogService } from './log.service';
 
 const mockBackendResponse = (connection: MockConnection, response: string) => {
     connection.mockRespond(new Response(new ResponseOptions({body: response})));
diff --git a/ng2-components/ng2-alfresco-core/src/services/upload.service.spec.ts b/ng2-components/ng2-alfresco-core/src/services/upload.service.spec.ts
index f69a69d536..e88ba853f4 100644
--- a/ng2-components/ng2-alfresco-core/src/services/upload.service.spec.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/upload.service.spec.ts
@@ -19,9 +19,9 @@ import { EventEmitter } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { FileModel, FileUploadOptions } from '../models/file.model';
 import { AlfrescoApiService } from './alfresco-api.service';
-import { AuthenticationService } from './authentication.service';
 import { AlfrescoSettingsService } from './alfresco-settings.service';
 import { AppConfigModule } from './app-config.service';
+import { AuthenticationService } from './authentication.service';
 import { StorageService } from './storage.service';
 import { UploadService } from './upload.service';
 
@@ -61,15 +61,15 @@ describe('UploadService', () => {
     });
 
     it('should add an element in the queue and returns it', () => {
-        let filesFake = new FileModel(<File>{ name: 'fake-name', size: 10 });
+        let filesFake = new FileModel(<File> { name: 'fake-name', size: 10 });
         service.addToQueue(filesFake);
         expect(service.getQueue().length).toEqual(1);
     });
 
     it('should add two elements in the queue and returns them', () => {
         let filesFake = [
-            new FileModel(<File>{ name: 'fake-name', size: 10 }),
-            new FileModel(<File>{ name: 'fake-name2', size: 20 })
+            new FileModel(<File> { name: 'fake-name', size: 10 }),
+            new FileModel(<File> { name: 'fake-name2', size: 20 })
         ];
         service.addToQueue(...filesFake);
         expect(service.getQueue().length).toEqual(2);
@@ -91,8 +91,8 @@ describe('UploadService', () => {
             done();
         });
         let fileFake = new FileModel(
-            <File>{ name: 'fake-name', size: 10 },
-            <FileUploadOptions>{ parentId: '-root-', path: 'fake-dir' }
+            <File> { name: 'fake-name', size: 10 },
+            <FileUploadOptions> { parentId: '-root-', path: 'fake-dir' }
         );
         service.addToQueue(fileFake);
         service.uploadFilesInTheQueue(emitter);
@@ -116,8 +116,8 @@ describe('UploadService', () => {
             done();
         });
         let fileFake = new FileModel(
-            <File>{ name: 'fake-name', size: 10 },
-            <FileUploadOptions>{ parentId: '-root-' }
+            <File> { name: 'fake-name', size: 10 },
+            <FileUploadOptions> { parentId: '-root-' }
         );
         service.addToQueue(fileFake);
         service.uploadFilesInTheQueue(emitter);
@@ -138,7 +138,7 @@ describe('UploadService', () => {
             expect(e.value).toEqual('File aborted');
             done();
         });
-        let fileFake = new FileModel(<File>{ name: 'fake-name', size: 10 });
+        let fileFake = new FileModel(<File> { name: 'fake-name', size: 10 });
         service.addToQueue(fileFake);
         service.uploadFilesInTheQueue(emitter);
 
@@ -149,7 +149,7 @@ describe('UploadService', () => {
     it('If versioning is true autoRename should not be present and majorVersion should be a param', () => {
         let emitter = new EventEmitter();
 
-        const filesFake = new FileModel(<File>{ name: 'fake-name', size: 10 }, { newVersion: true });
+        const filesFake = new FileModel(<File> { name: 'fake-name', size: 10 }, { newVersion: true });
         service.addToQueue(filesFake);
         service.uploadFilesInTheQueue(emitter);
 
@@ -165,7 +165,7 @@ describe('UploadService', () => {
             done();
         });
         let filesFake = new FileModel(
-            <File>{ name: 'fake-name', size: 10 },
+            <File> { name: 'fake-name', size: 10 },
             <FileUploadOptions> { parentId: '123', path: 'fake-dir' }
         );
         service.addToQueue(filesFake);
@@ -194,8 +194,8 @@ describe('UploadService', () => {
             done();
         });
 
-        let fileFake1 = new FileModel(<File>{ name: 'fake-name1', size: 10 });
-        let fileFake2 = new FileModel(<File>{ name: 'fake-name2', size: 10 });
+        let fileFake1 = new FileModel(<File> { name: 'fake-name1', size: 10 });
+        let fileFake2 = new FileModel(<File> { name: 'fake-name2', size: 10 });
         let filelist = [fileFake1, fileFake2];
         service.addToQueue(...filelist);
         service.uploadFilesInTheQueue(emitter);