diff --git a/PageCompiler/src/CodeWriter.cpp b/PageCompiler/src/CodeWriter.cpp
index 1c5216752..e958fcaf8 100644
--- a/PageCompiler/src/CodeWriter.cpp
+++ b/PageCompiler/src/CodeWriter.cpp
@@ -68,7 +68,6 @@ void CodeWriter::writeImpl(std::ostream& ostr, const std::string& headerFileName
 		ostr << "#include \"Poco/StreamCopier.h\"\n";
 		ostr << "#include <sstream>\n";
 	}
-	ostr << "\n\n";
 
 	std::string decls(_page.implDecls().str());
 	if (!decls.empty())
@@ -76,6 +75,8 @@ void CodeWriter::writeImpl(std::ostream& ostr, const std::string& headerFileName
 		ostr << decls << "\n\n";
 	}
 
+	ostr << "using namespace std::string_literals;\n\n\n";
+
 	beginNamespace(ostr);
 
 	std::string path = _page.get("page.path", "");
@@ -328,24 +329,24 @@ void CodeWriter::writeResponse(std::ostream& ostr)
 		ostr << "\tresponse.setChunkedTransferEncoding(true);\n";
 	}
 
-	ostr << "\tresponse.setContentType(\"" << contentType << "\");\n";
+	ostr << "\tresponse.setContentType(\"" << contentType << "\"s);\n";
 	if (!contentLang.empty())
 	{
-		ostr << "\tif (request.has(\"Accept-Language\"))\n"
-			 << "\t\tresponse.set(\"Content-Language\", \"" << contentLang << "\");\n";
+		ostr << "\tif (request.has(\"Accept-Language\"s))\n"
+			 << "\t\tresponse.set(\"Content-Language\"s, \"" << contentLang << "\"s);\n";
 	}
 	if (!contentSecurityPolicy.empty())
 	{
-		ostr << "\tresponse.set(\"Content-Secure-Policy\", \"" << contentSecurityPolicy << "\");\n";
+		ostr << "\tresponse.set(\"Content-Secure-Policy\"s, \"" << contentSecurityPolicy << "\"s);\n";
 	}
 	if (compressed)
 	{
-		ostr << "\tbool _compressResponse(request.hasToken(\"Accept-Encoding\", \"gzip\"));\n"
-		     << "\tif (_compressResponse) response.set(\"Content-Encoding\", \"gzip\");\n";
+		ostr << "\tbool _compressResponse(request.hasToken(\"Accept-Encoding\"s, \"gzip\"s));\n"
+		     << "\tif (_compressResponse) response.set(\"Content-Encoding\"s, \"gzip\"s);\n";
 	}
 	if (!cacheControl.empty())
 	{
-		ostr << "\tresponse.set(\"Cache-Control\", \"" << cacheControl << "\");\n";
+		ostr << "\tresponse.set(\"Cache-Control\"s, \"" << cacheControl << "\"s);\n";
 	}
 	ostr << "\n";
 }
diff --git a/PageCompiler/src/OSPCodeWriter.cpp b/PageCompiler/src/OSPCodeWriter.cpp
index 95c66bea1..e37c8b01d 100644
--- a/PageCompiler/src/OSPCodeWriter.cpp
+++ b/PageCompiler/src/OSPCodeWriter.cpp
@@ -107,14 +107,14 @@ void OSPCodeWriter::writeSession(std::ostream& ostr)
 		std::string sessionCode;
 		if (session.empty()) return;
 		if (session[0] == '@')
-			sessionCode = "context()->thisBundle()->properties().getString(\"" + session.substr(1) + "\")";
+			sessionCode = "context()->thisBundle()->properties().getString(\"" + session.substr(1) + "\"s)";
 		else
-			sessionCode = "\"" + session + "\"";
+			sessionCode = "\"" + session + "\"s";
 		std::string sessionTimeoutCode = page().get("page.sessionTimeout", "30");
 		int sessionTimeout;
 		if (!Poco::NumberParser::tryParse(sessionTimeoutCode, sessionTimeout))
 		{
-			sessionTimeoutCode = "context()->thisBundle()->properties().getInt(\"" + sessionTimeoutCode + "\")";
+			sessionTimeoutCode = "context()->thisBundle()->properties().getInt(\"" + sessionTimeoutCode + "\"s)";
 		}
 		ostr << "\tPoco::OSP::Web::WebSession::Ptr session;\n";
 		ostr << "\t{\n";
diff --git a/PageCompiler/src/PageReader.h b/PageCompiler/src/PageReader.h
index 8bfdaeb1e..9589a5eaf 100644
--- a/PageCompiler/src/PageReader.h
+++ b/PageCompiler/src/PageReader.h
@@ -35,7 +35,7 @@ public:
 	~PageReader();
 		/// Destroys the PageReader.
 
-	void parse(std::istream& pageStream);
+	void parse(std::istream& pageStream);	
 		/// Parses a HTML file containing server page directives,
 		/// converts the file into C++ code and adds the code
 		/// to the reader's Page object. Also parses page
@@ -74,7 +74,7 @@ protected:
 
 protected:
 	void generateLineDirective(std::ostream& ostr);
-
+	
 private:
 	PageReader();
 	PageReader(const PageReader&);