diff --git a/packages/Sandblocks-Babylonian/SBExample.class.st b/packages/Sandblocks-Babylonian/SBExample.class.st
index dbd70d78..f01bfd9f 100644
--- a/packages/Sandblocks-Babylonian/SBExample.class.st
+++ b/packages/Sandblocks-Babylonian/SBExample.class.st
@@ -66,7 +66,7 @@ SBExample class >> newFor: aMessage [
 { #category : #'as yet unclassified' }
 SBExample class >> registerShortcuts: aProvider [
 
-	aProvider registerShortcut: $q command do: #wrapWithExampleWatch
+	aProvider registerShortcut: $w command do: #wrapWithExampleWatch
 ]
 
 { #category : #'as yet unclassified' }
diff --git a/packages/Sandblocks-Babylonian/SBStGrammarHandler.extension.st b/packages/Sandblocks-Babylonian/SBStGrammarHandler.extension.st
index 4c1df86a..675290b4 100644
--- a/packages/Sandblocks-Babylonian/SBStGrammarHandler.extension.st
+++ b/packages/Sandblocks-Babylonian/SBStGrammarHandler.extension.st
@@ -24,6 +24,7 @@ SBStGrammarHandler >> addExample: anExample [
 		
 	anExample startRunning.
 	self block sandblockEditor select: anExample nameBlock.
+	self block sandblockEditor save: method tryFixing: true quick: false.
 ]
 
 { #category : #'*Sandblocks-Babylonian' }
diff --git a/packages/Sandblocks-Core/SBGrammarHandler.class.st b/packages/Sandblocks-Core/SBGrammarHandler.class.st
index f261567f..ae7d6a02 100644
--- a/packages/Sandblocks-Core/SBGrammarHandler.class.st
+++ b/packages/Sandblocks-Core/SBGrammarHandler.class.st
@@ -194,7 +194,9 @@ SBGrammarHandler >> watchWith: aWatchClass [
 	self block sandblockEditor do: (SBWrapCommand new
 		outer: aWatchClass new newIdentifier;
 		inner: self block;
-		wrap: [:outer :inner | outer expression: inner])
+		wrap: [:outer :inner | outer expression: inner]).
+		
+	self block sandblockEditor save: self block containingArtefact tryFixing: true quick: false.
 ]
 
 { #category : #'callback helpers' }
diff --git a/packages/Sandblocks-Smalltalk/SBStGrammarHandler.class.st b/packages/Sandblocks-Smalltalk/SBStGrammarHandler.class.st
index f99f25d0..25cf51f4 100644
--- a/packages/Sandblocks-Smalltalk/SBStGrammarHandler.class.st
+++ b/packages/Sandblocks-Smalltalk/SBStGrammarHandler.class.st
@@ -612,7 +612,10 @@ SBStGrammarHandler >> wrapInOptionalVariant [
 					named: inner printString 
 					alternatives: (self defaultOptionalAlternativesForBlocks: inner)
 					activeIndex: 2];
-			yourself]
+			yourself].
+		
+	variant sandblockEditor select: variant nameBlock.
+	variant sandblockEditor save: variant containingArtefact tryFixing: true quick: false.
 ]
 
 { #category : #actions }
@@ -666,7 +669,10 @@ SBStGrammarHandler >> wrapInVariant [
 					named: inner printString 
 					alternatives: (self defaultAlternativesForBlocks: inner)
 					activeIndex: 2];
-			yourself]
+			yourself].
+		
+	variant sandblockEditor select: variant nameBlock.
+	variant sandblockEditor save: variant containingArtefact tryFixing: true quick: false.
 ]
 
 { #category : #actions }
diff --git a/packages/Sandblocks-Smalltalk/SBVariant.class.st b/packages/Sandblocks-Smalltalk/SBVariant.class.st
index fc062b54..db5c1df5 100644
--- a/packages/Sandblocks-Smalltalk/SBVariant.class.st
+++ b/packages/Sandblocks-Smalltalk/SBVariant.class.st
@@ -222,7 +222,7 @@ SBVariant >> beActive [
 		ifNil: [command do] 
 		ifNotNil:[:theEditor | theEditor do: command].
 		
-	self saveArtefact.
+	self containingArtefact sandblockEditor save: self containingArtefact tryFixing: true quick: false.
 ]
 
 { #category : #actions }
@@ -236,7 +236,7 @@ SBVariant >> beInactive [
 		ifNil: [command do] 
 		ifNotNil:[:theEditor | theEditor do: command].
 		
-	self saveArtefact.
+	self containingArtefact sandblockEditor save: self containingArtefact tryFixing: true quick: false.
 ]
 
 { #category : #accessing }
@@ -419,14 +419,6 @@ SBVariant >> replaceValuesFrom: anotherVariant [
 	self named: anotherVariant name alternatives: anotherVariant alternatives activeIndex: anotherVariant activeIndex  
 ]
 
-{ #category : #actions }
-SBVariant >> saveArtefact [
-
-	self containingArtefact save.
-	self containingArtefact sandblockEditor ifNotNil: [:theEditor | theEditor markSaved: self containingArtefact]
-	
-]
-
 { #category : #accessing }
 SBVariant >> statementsFor: aNamedBlock [
 
diff --git a/packages/Sandblocks-Watch/SBWatchView.class.st b/packages/Sandblocks-Watch/SBWatchView.class.st
index c4ed4b2c..53b356d3 100644
--- a/packages/Sandblocks-Watch/SBWatchView.class.st
+++ b/packages/Sandblocks-Watch/SBWatchView.class.st
@@ -264,7 +264,7 @@ SBWatchView >> printOn: aStream [
 { #category : #actions }
 SBWatchView >> reportValue: anObject [
 
-	self reportValue: {anObject} sized: SBMorphResizer newIdentity
+	self reportValues: {anObject} sized: SBMorphResizer newIdentity
 ]
 
 { #category : #actions }