diff --git a/src/compiler/compile/Component.ts b/src/compiler/compile/Component.ts
index ce1afc5300..2ca04f3adf 100644
--- a/src/compiler/compile/Component.ts
+++ b/src/compiler/compile/Component.ts
@@ -1577,7 +1577,7 @@ function process_component_options(component: Component, nodes) {
 
 				switch (name) {
 					case 'tag': {
-						component.warn(attribute, compiler_warnings.tag_option_deprecated)
+						component.warn(attribute, compiler_warnings.tag_option_deprecated);
 						parse_tag(attribute, get_value(attribute, compiler_errors.invalid_tag_attribute));
 						break;
 					}
diff --git a/src/compiler/compile/compiler_errors.ts b/src/compiler/compile/compiler_errors.ts
index c276b98278..860fa20d9f 100644
--- a/src/compiler/compile/compiler_errors.ts
+++ b/src/compiler/compile/compiler_errors.ts
@@ -204,7 +204,7 @@ export default {
 	},
 	invalid_customElement_attribute: {
 		code: 'invalid-customElement-attribute',
-		message: "'customElement' must be a string literal defining a valid custom element name or an object of the form "+
+		message: "'customElement' must be a string literal defining a valid custom element name or an object of the form " +
 		"{ tag: string; shadow?: 'open' | 'none'; props?: { [key: string]: { attribute?: string; reflect?: boolean; type: .. } } }"
 	},
 	invalid_tag_attribute: {
diff --git a/src/compiler/compile/compiler_warnings.ts b/src/compiler/compile/compiler_warnings.ts
index c9ba72ac9d..daa02d5121 100644
--- a/src/compiler/compile/compiler_warnings.ts
+++ b/src/compiler/compile/compiler_warnings.ts
@@ -32,7 +32,7 @@ export default {
 	}),
 	missing_custom_element_compile_options: {
 		code: 'missing-custom-element-compile-options',
-		message: "The 'tag' option is used when generating a custom element. Did you forget the 'customElement: true' compile option?"
+		message: "The 'customElement' option is used when generating a custom element. Did you forget the 'customElement: true' compile option?"
 	},
 	css_unused_selector: (selector: string) => ({
 		code: 'css-unused-selector',
diff --git a/test/js/samples/css-shadow-dom-keyframes/expected.js b/test/js/samples/css-shadow-dom-keyframes/expected.js
index 97c40eca12..98f5120c9b 100644
--- a/test/js/samples/css-shadow-dom-keyframes/expected.js
+++ b/test/js/samples/css-shadow-dom-keyframes/expected.js
@@ -13,7 +13,7 @@ import {
 } from "svelte/internal";
 
 function add_css(target) {
-	append_styles(target, "svelte-66l35w", "div.svelte-66l35w{animation:svelte-66l35w-foo 1s}@keyframes svelte-66l35w-foo{0%{opacity:0}100%{opacity:1}}");
+	append_styles(target, "svelte-10axo0s", "div.svelte-10axo0s{animation:svelte-10axo0s-foo 1s}@keyframes svelte-10axo0s-foo{0%{opacity:0}100%{opacity:1}}");
 }
 
 function create_fragment(ctx) {
@@ -23,7 +23,7 @@ function create_fragment(ctx) {
 		c() {
 			div = element("div");
 			div.textContent = "fades in";
-			attr(div, "class", "svelte-66l35w");
+			attr(div, "class", "svelte-10axo0s");
 		},
 		m(target, anchor) {
 			insert(target, div, anchor);
diff --git a/test/validator/samples/missing-custom-element-compile-options/warnings.json b/test/validator/samples/missing-custom-element-compile-options/warnings.json
index 243623f51c..f0cef37936 100644
--- a/test/validator/samples/missing-custom-element-compile-options/warnings.json
+++ b/test/validator/samples/missing-custom-element-compile-options/warnings.json
@@ -2,10 +2,10 @@
 	{
 		"code": "missing-custom-element-compile-options",
 		"end": {
-			"column": 36,
+			"column": 46,
 			"line": 1
 		},
-		"message": "The 'tag' option is used when generating a custom element. Did you forget the 'customElement: true' compile option?",
+		"message": "The 'customElement' option is used when generating a custom element. Did you forget the 'customElement: true' compile option?",
 		"start": {
 			"column": 16,
 			"line": 1
diff --git a/test/validator/samples/tag-custom-element-options-missing/warnings.json b/test/validator/samples/tag-custom-element-options-missing/warnings.json
index a1927f41df..134c8b929d 100644
--- a/test/validator/samples/tag-custom-element-options-missing/warnings.json
+++ b/test/validator/samples/tag-custom-element-options-missing/warnings.json
@@ -1,12 +1,12 @@
 [{
 		"code": "missing-custom-element-compile-options",
-		"message": "The 'tag' option is used when generating a custom element. Did you forget the 'customElement: true' compile option?",
+		"message": "The 'customElement' option is used when generating a custom element. Did you forget the 'customElement: true' compile option?",
 		"start": {
 				"line": 1,
 				"column": 16
 		},
 		"end": {
 				"line": 1,
-				"column": 36
+				"column": 46
 		}
 }]
diff --git a/test/validator/samples/tag-invalid/errors.json b/test/validator/samples/tag-invalid/errors.json
index f3aef07fea..2ba999cb31 100644
--- a/test/validator/samples/tag-invalid/errors.json
+++ b/test/validator/samples/tag-invalid/errors.json
@@ -7,6 +7,6 @@
 	},
 	"end": {
 		"line": 1,
-		"column": 29
+		"column": 39
 	}
 }]