diff --git a/src/demo-app/bottom-sheet/bottom-sheet-demo.html b/src/demo-app/bottom-sheet/bottom-sheet-demo.html
index 802782cc7f9..034ef5e51ba 100644
--- a/src/demo-app/bottom-sheet/bottom-sheet-demo.html
+++ b/src/demo-app/bottom-sheet/bottom-sheet-demo.html
@@ -38,7 +38,7 @@
   <mat-nav-list>
     <mat-list-item (click)="bottomSheetRef.dismiss()" *ngFor="let action of [1, 2, 3]">
       <mat-icon mat-list-icon>folder</mat-icon>
-      <span mat-line>Action {{ link }}</span>
+      <span mat-line>Action {{ action }}</span>
       <span mat-line>Description</span>
     </mat-list-item>
   </mat-nav-list>
diff --git a/src/demo-app/bottom-sheet/bottom-sheet-demo.ts b/src/demo-app/bottom-sheet/bottom-sheet-demo.ts
index 8b8039d3fe1..b41cf9a40d9 100644
--- a/src/demo-app/bottom-sheet/bottom-sheet-demo.ts
+++ b/src/demo-app/bottom-sheet/bottom-sheet-demo.ts
@@ -48,7 +48,7 @@ export class BottomSheetDemo {
   template: `
     <mat-nav-list>
       <a href="#" mat-list-item (click)="handleClick($event)" *ngFor="let action of [1, 2, 3]">
-        <span mat-line>Action {{ link }}</span>
+        <span mat-line>Action {{ action }}</span>
         <span mat-line>Description</span>
       </a>
     </mat-nav-list>
diff --git a/src/demo-app/dialog/dialog-demo.html b/src/demo-app/dialog/dialog-demo.html
index a4e2fba1eec..ebf76c00326 100644
--- a/src/demo-app/dialog/dialog-demo.html
+++ b/src/demo-app/dialog/dialog-demo.html
@@ -122,6 +122,6 @@
   </mat-form-field>
 
   <p> {{ data.message }} </p>
-  <button type="button" (click)="dialogRef.close(lastCloseResult = howMuch.value)">Close dialog</button>
+  <button type="button" (click)="dialogRef.close(howMuch.value)">Close dialog</button>
   <button (click)="dialogRef.updateSize('500px', '500px').updatePosition({ top: '25px', left: '25px' });">Change dimensions</button>`
 </ng-template>
diff --git a/src/demo-app/sidenav/sidenav-demo.html b/src/demo-app/sidenav/sidenav-demo.html
index 53fcd5647e0..7df77ef46f5 100644
--- a/src/demo-app/sidenav/sidenav-demo.html
+++ b/src/demo-app/sidenav/sidenav-demo.html
@@ -9,7 +9,7 @@
                  [fixedInViewport]="fixed" [fixedTopGap]="fixedTop" [fixedBottomGap]="fixedBottom">
       Start Side Sidenav
       <br>
-      <button mat-button (click)="start.close('mouse')">Close</button>
+      <button mat-button (click)="start.close()">Close</button>
       <br>
       <button mat-button (click)="end.open('keyboard')">Open End Side</button>
       <br>
@@ -24,7 +24,7 @@
                  [fixedInViewport]="fixed" [fixedTopGap]="fixedTop" [fixedBottomGap]="fixedBottom">
       End Side Sidenav
       <br>
-      <button mat-button (click)="end.close('mouse')">Close</button>
+      <button mat-button (click)="end.close()">Close</button>
       <div class="demo-filler-content" *ngFor="let c of fillerContent">Filler Content</div>
     </mat-sidenav>
 
diff --git a/src/demo-app/tsconfig-aot.json b/src/demo-app/tsconfig-aot.json
index 1ed79d30f9e..09882d5a919 100644
--- a/src/demo-app/tsconfig-aot.json
+++ b/src/demo-app/tsconfig-aot.json
@@ -33,7 +33,6 @@
   ],
   "angularCompilerOptions": {
     "skipTemplateCodegen": false,
-    // TODO: disabled for now due to @angular/forms
-    "fullTemplateTypeCheck": false
+    "fullTemplateTypeCheck": true
   }
 }
diff --git a/src/e2e-app/tsconfig-build.json b/src/e2e-app/tsconfig-build.json
index af370e60fde..6bf1c2e84f7 100644
--- a/src/e2e-app/tsconfig-build.json
+++ b/src/e2e-app/tsconfig-build.json
@@ -42,7 +42,6 @@
   ],
   "angularCompilerOptions": {
     "skipMetadataEmit": true,
-    // TODO: disabled for now due to @angular/forms
-    "fullTemplateTypeCheck": false
+    "fullTemplateTypeCheck": true
   }
 }
diff --git a/src/material-examples/tsconfig-build.json b/src/material-examples/tsconfig-build.json
index 4fbca15cf37..3cc1a476ca5 100644
--- a/src/material-examples/tsconfig-build.json
+++ b/src/material-examples/tsconfig-build.json
@@ -37,7 +37,10 @@
     "flatModuleOutFile": "index.js",
     "flatModuleId": "@angular/material-examples",
     "skipTemplateCodegen": true,
-    // TODO: disabled for now due to @angular/forms
+    // TODO(paul): Needs to stay disabled for now because when building the examples in non-release
+    // format the metadata of Material which is required to build the examples package, are not
+    // including all re-exports and therefore the build will fail. This issue will be fixed with
+    // the new compiler CLI that no longer outputs metadata.
     "fullTemplateTypeCheck": false
   }
 }