diff --git a/Jakefile.js b/Jakefile.js
index ed4751c47f4..b13e2cfacf9 100644
--- a/Jakefile.js
+++ b/Jakefile.js
@@ -695,6 +695,7 @@ function runTestsAndWriteOutput(file) {
     cleanTestDirs();
     var tests = process.env.test || process.env.tests || process.env.t;
     var light = process.env.light || false;
+    var beep = process.env.beep;
     var testConfigFile = 'test.config';
     if (fs.existsSync(testConfigFile)) {
         fs.unlinkSync(testConfigFile);
@@ -790,6 +791,8 @@ function runTestsAndWriteOutput(file) {
         console.log(comments.join(os.EOL));
         deleteTemporaryProjectOutput();
         complete();
+
+        if (beep) process.stdout.write("\u0007");
     });
     ex.addListener("error", function (e, status) {
         if (progress.visible) {
@@ -804,6 +807,7 @@ function runTestsAndWriteOutput(file) {
         }
 
         deleteTemporaryProjectOutput();
+        if (beep) process.stdout.write("\u0007");
         fail("Process exited with code " + status);
     });
     ex.run();
diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts
index 9ddc83ca3b9..922a56697ae 100644
--- a/src/compiler/transformers/ts.ts
+++ b/src/compiler/transformers/ts.ts
@@ -1793,11 +1793,14 @@ namespace ts {
                 return undefined;
             }
 
-            return createMethod(
-                visitNodes(node.modifiers, visitor, isModifier),
-                visitPropertyNameOfClassElement(node),
-                visitNodes(node.parameters, visitor, isParameter),
-                transformFunctionBody(node),
+            return setOriginalNode(
+                createMethod(
+                    visitNodes(node.modifiers, visitor, isModifier),
+                    visitPropertyNameOfClassElement(node),
+                    visitNodes(node.parameters, visitor, isParameter),
+                    transformFunctionBody(node),
+                    node
+                ),
                 node
             );
         }