diff --git a/modules/@angular/upgrade/src/upgrade_ng1_adapter.ts b/modules/@angular/upgrade/src/upgrade_ng1_adapter.ts
index a7fc467372..5cb79d61d6 100644
--- a/modules/@angular/upgrade/src/upgrade_ng1_adapter.ts
+++ b/modules/@angular/upgrade/src/upgrade_ng1_adapter.ts
@@ -91,7 +91,10 @@ export class UpgradeNg1ComponentAdapterBuilder {
               this.outputs.push(outputName);
               this.outputsRename.push(outputNameRenameChange);
               this.propertyMap[outputName] = localName;
-            // don't break; let it fall through to '@'
+              this.inputs.push(inputName);
+              this.inputsRename.push(inputNameRename);
+              this.propertyMap[inputName] = localName;
+              break;
             case '@':
             // handle the '<' binding of angular 1.5 components
             case '<':
diff --git a/modules/tsconfig.json b/modules/tsconfig.json
index ed4ebc1d47..db141373bd 100644
--- a/modules/tsconfig.json
+++ b/modules/tsconfig.json
@@ -7,6 +7,7 @@
     "moduleResolution": "node",
     "outDir": "../dist/all/",
     "noImplicitAny": true,
+    "noFallthroughCasesInSwitch": true,
     "paths": {
       "selenium-webdriver": ["../node_modules/@types/selenium-webdriver/index.d.ts"],
       "rxjs/*": ["../node_modules/rxjs/*"],
diff --git a/tools/@angular/tsc-wrapped/src/collector.ts b/tools/@angular/tsc-wrapped/src/collector.ts
index 1b7a4b2cc5..203bcea555 100644
--- a/tools/@angular/tsc-wrapped/src/collector.ts
+++ b/tools/@angular/tsc-wrapped/src/collector.ts
@@ -64,9 +64,8 @@ export class MetadataCollector {
         let isConstructor = false;
         switch (member.kind) {
           case ts.SyntaxKind.Constructor:
-            isConstructor = true;
-          // fallthrough
           case ts.SyntaxKind.MethodDeclaration:
+            isConstructor = member.kind === ts.SyntaxKind.Constructor;
             const method = <ts.MethodDeclaration|ts.ConstructorDeclaration>member;
             const methodDecorators = getDecorators(method.decorators);
             const parameters = method.parameters;
diff --git a/tools/@angular/tsc-wrapped/src/evaluator.ts b/tools/@angular/tsc-wrapped/src/evaluator.ts
index e5aabb6de5..00f3922845 100644
--- a/tools/@angular/tsc-wrapped/src/evaluator.ts
+++ b/tools/@angular/tsc-wrapped/src/evaluator.ts
@@ -176,6 +176,8 @@ export class Evaluator {
             case ts.SyntaxKind.BarBarToken:
               return this.isFoldableWorker(binaryExpression.left, folding) &&
                   this.isFoldableWorker(binaryExpression.right, folding);
+            default:
+              return false;
           }
         case ts.SyntaxKind.PropertyAccessExpression:
           const propertyAccessExpression = <ts.PropertyAccessExpression>node;
diff --git a/tools/tsconfig.json b/tools/tsconfig.json
index f8a392730a..a0303ac0f5 100644
--- a/tools/tsconfig.json
+++ b/tools/tsconfig.json
@@ -8,6 +8,7 @@
     "moduleResolution": "node",
     "outDir": "../dist/tools/",
     "noImplicitAny": true,
+    "noFallthroughCasesInSwitch": true,
     "paths": {
     },
     "rootDir": ".",