diff --git a/repository/TiddlyWiki/Tiddler.class.st b/repository/TiddlyWiki/Tiddler.class.st
index 6010092..b70577f 100644
--- a/repository/TiddlyWiki/Tiddler.class.st
+++ b/repository/TiddlyWiki/Tiddler.class.st
@@ -121,6 +121,7 @@ Tiddler >> created: anObject [
 
 { #category : #accessing }
 Tiddler >> createdAsTWFormat [
+	(self created beginsWith: 'NaN') ifTrue: [ self created: self class nowLocal].
 	^ ((ZTimestampFormat fromString: '20010203160506700') 
 			format: (ZTimestamp fromString: self created)) copyFrom: 1 to: 17
 ]
@@ -188,16 +189,18 @@ Tiddler >> exportSTONFileInto: subfolder [
 { #category : #accessing }
 Tiddler >> exportSTONFileOptimized [
 
-	| exporter wikiFolder |
+	| exporter wikiFolder tiddlersFolder |
 	wikiFolder := self wiki file parent.
 	exporter := wikiFolder / 'scripts' / 'stringAsFileInto'.
 	exporter exists ifFalse: [ self installTiddlerExporter ].
+	tiddlersFolder := wikiFolder / 'tiddlers'.
+	tiddlersFolder exists ifFalse: [ tiddlersFolder ensureCreateDirectory ].
 	
 	OSSUnixSubprocess new 
 		command: exporter fullName;
 		arguments: { self asStonStringPretty . self fileName  };
-		workingDirectory: exporter parent fullName;
-		runAndWaitOnExitDo: [ :process :outString  | ^ wikiFolder / 'scripts' / self fileName  ]
+		workingDirectory: tiddlersFolder fullName;
+		runAndWaitOnExitDo: [ :process :outString  | ^ tiddlersFolder / self fileName  ]
 ]
 
 { #category : #accessing }
diff --git a/repository/TiddlyWiki/TiddlyWiki.class.st b/repository/TiddlyWiki/TiddlyWiki.class.st
index ef3b662..21011e3 100644
--- a/repository/TiddlyWiki/TiddlyWiki.class.st
+++ b/repository/TiddlyWiki/TiddlyWiki.class.st
@@ -106,7 +106,7 @@ TiddlyWiki >> commonTiddlers [
 	content 
 		addAll: (self contentTiddlers 
 			select: [ :each | each isTW5Type or: [ each isNilType ]]);
-		addAll: (self contentTiddlers select: [ :each | each isJavascript ]);
+		"addAll: (self contentTiddlers select: [ :each | each isJavascript ]);"
 		addAll: (self contentTiddlers select: [ :each | each isXTiddlerDictionary ]);
 		addAll: (self contentTiddlers select: [ :each | each isTextPlain ]);
 		addAll: (self contentTiddlers select: [ :each | each isMarkdown ]).