diff --git a/ng2-components/ng2-alfresco-datatable/src/components/pagination/pagination.component.html b/ng2-components/ng2-alfresco-datatable/src/components/pagination/pagination.component.html
index 5598cc3b73..281ac1fe21 100644
--- a/ng2-components/ng2-alfresco-datatable/src/components/pagination/pagination.component.html
+++ b/ng2-components/ng2-alfresco-datatable/src/components/pagination/pagination.component.html
@@ -2,16 +2,16 @@
     <span class="mdl-paging__per-page">
         <span class="mdl-paging__per-page-label">Rows per page:</span>
         <span class="mdl-paging__per-page-value" [attr.data-automation-id]="'rows_per_page_' + pageSize">{{pagination.maxItems}}</span>
-        <button alfresco-mdl-button id="pageSizePicker" class="mdl-button--icon mdl-paging__per-page-dropdown">
-            <i class="material-icons">arrow_drop_down</i>
-        </button>
-        <ul alfresco-mdl-menu for="pageSizePicker" class="mdl-menu--bottom-right">
-            <li *ngFor="let size of supportedPageSizes"
-                tabindex="-1" [attr.data-value]="size" class="mdl-menu__item"
-                (click)="setPageSize(size)">
+
+        <md-menu #appMenu="mdMenu" for="pageSizePicker">
+            <div *ngFor="let size of supportedPageSizes"
+                tabindex="-1" [attr.data-value]="size" md-menu-item (click)="setPageSize(size)">
                 <span>{{size}}</span>
-            </li>
-        </ul>
+            </div>
+        </md-menu>
+        <button  id="pageSizePicker" md-icon-button [mdMenuTriggerFor]="appMenu">
+            <md-icon>arrow_drop_down</md-icon>
+        </button>
     </span>
     <span class="mdl-paging__count">{{summary}}</span>
     <button (click)="showPrevPage()"
diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.spec.ts b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.spec.ts
index b14a95d503..f1cbc0845a 100644
--- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.spec.ts
+++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.spec.ts
@@ -116,6 +116,8 @@ describe('AlfrescoSearchComponent', () => {
         });
     }));
 
+    afterEach(() => { fixture.detectChanges(); });
+
     it('should not have a search term by default', () => {
         expect(component.searchTerm).toBe('');
     });
@@ -124,8 +126,11 @@ describe('AlfrescoSearchComponent', () => {
         let injector = ReflectiveInjector.resolveAndCreate([
             {provide: ActivatedRoute, useValue: {params: Observable.from([{q: 'exampleTerm692'}])}}
         ]);
+
         let search = new AlfrescoSearchComponent(null, null, injector.get(ActivatedRoute));
+
         search.ngOnInit();
+
         expect(search.searchTerm).toBe('exampleTerm692');
     });
 
@@ -140,14 +145,18 @@ describe('AlfrescoSearchComponent', () => {
             {provide: ActivatedRoute, useValue: {params: Observable.from([{}])}}
         ]);
         let search = new AlfrescoSearchComponent(injector.get(AlfrescoSearchService), null, injector.get(ActivatedRoute));
+
         search.ngOnInit();
+
         expect(search.searchTerm).toBeNull();
     });
 
     it('should setup i18n folder', () => {
         let translationService = fixture.debugElement.injector.get(AlfrescoTranslationService);
         spyOn(translationService, 'addTranslationFolder');
+
         fixture.detectChanges();
+
         expect(translationService.addTranslationFolder).toHaveBeenCalledWith('ng2-alfresco-search', 'node_modules/ng2-alfresco-search/src');
     });
 
diff --git a/scripts/npm-build-all.sh b/scripts/npm-build-all.sh
index 9388d11dc0..3e76086b1c 100755
--- a/scripts/npm-build-all.sh
+++ b/scripts/npm-build-all.sh
@@ -71,9 +71,13 @@ do
   build_project $DESTDIR $PACKAGE
 done
 
+#Install demo
+
+cd "$DIR/../demo-shell-ng2"
+npm install
+
 if $RUN_LINK == true; then
     #LINK ALL THE COMPONENTS INSIDE THE DEMO-SHELL
-    cd "$DIR/../demo-shell-ng2"
     for PACKAGE in ${projects[@]}
     do
       DESTDIR="$DIR/../ng2-components/${PACKAGE}"