diff --git a/OdfFile/DataTypes/borderwidths.cpp b/OdfFile/DataTypes/borderwidths.cpp
index 2f3a7d1cdb..c28403e6d1 100644
--- a/OdfFile/DataTypes/borderwidths.cpp
+++ b/OdfFile/DataTypes/borderwidths.cpp
@@ -39,7 +39,7 @@ namespace cpdoccore { namespace odf_types {
 
 std::wostream & operator << (std::wostream & _Wostream, const border_widths & _Val)
 {
-    _Wostream << _Val.get_len1() << " " << _Val.get_len2() << " " << _Val.get_len3();
+    _Wostream << _Val.get_len1() << L" " << _Val.get_len2() << L" " << _Val.get_len3();
     return _Wostream;    
 }
 
diff --git a/OdfFile/DataTypes/dropcaplength.cpp b/OdfFile/DataTypes/dropcaplength.cpp
index 480143bee5..dd5873f735 100644
--- a/OdfFile/DataTypes/dropcaplength.cpp
+++ b/OdfFile/DataTypes/dropcaplength.cpp
@@ -42,7 +42,7 @@ std::wostream & operator << (std::wostream & _Wostream, const drop_cap_length &
     switch(_Val.get_type())
     {
     case drop_cap_length::Word:
-        _Wostream << "word";
+        _Wostream << L"word";
         break;
     case drop_cap_length::Integer:
         _Wostream << _Val.get_value();
diff --git a/OdfFile/DataTypes/linemode.cpp b/OdfFile/DataTypes/linemode.cpp
index 0086dc4817..9c34af9bd7 100644
--- a/OdfFile/DataTypes/linemode.cpp
+++ b/OdfFile/DataTypes/linemode.cpp
@@ -41,10 +41,10 @@ std::wostream & operator << (std::wostream & _Wostream, const line_mode & _Val)
     switch(_Val.get_type())
     {
     case line_mode::Continuous:
-        _Wostream << "continuous";
+        _Wostream << L"continuous";
         break;
     case line_mode::SkipWhiteSpace:
-        _Wostream << "skip-white-space";
+        _Wostream << L"skip-white-space";
         break;
     default:
         break;
diff --git a/OdfFile/DataTypes/linestyle.cpp b/OdfFile/DataTypes/linestyle.cpp
index fb473b8b59..e428bd3a58 100644
--- a/OdfFile/DataTypes/linestyle.cpp
+++ b/OdfFile/DataTypes/linestyle.cpp
@@ -41,28 +41,28 @@ std::wostream & operator << (std::wostream & _Wostream, const line_style & _Val)
     switch(_Val.get_type())
     {
     case line_style::None:
-        _Wostream << "none";
+        _Wostream << L"none";
         break;
     case line_style::Solid:
-        _Wostream << "solid";
+        _Wostream << L"solid";
         break;
     case line_style::Dotted:
-        _Wostream << "dotted";
+        _Wostream << L"dotted";
         break;
     case line_style::Dash:
-        _Wostream << "dash";
+        _Wostream << L"dash";
         break;
     case line_style::LongDash:
-        _Wostream << "long-dash";
+        _Wostream << L"long-dash";
         break;
     case line_style::DotDash:
-        _Wostream << "dot-dash";
+        _Wostream << L"dot-dash";
         break;
     case line_style::DotDotDash:
-        _Wostream << "dot-dot-dash";
+        _Wostream << L"dot-dot-dash";
         break;
     case line_style::Wave:
-        _Wostream << "wave";
+        _Wostream << L"wave";
         break;
     default:
         break;
diff --git a/OdfFile/DataTypes/linetype.cpp b/OdfFile/DataTypes/linetype.cpp
index 548cdbe43c..7383c43ea5 100644
--- a/OdfFile/DataTypes/linetype.cpp
+++ b/OdfFile/DataTypes/linetype.cpp
@@ -41,13 +41,13 @@ std::wostream & operator << (std::wostream & _Wostream, const line_type & _Val)
     switch(_Val.get_type())
     {
     case line_type::None:
-        _Wostream << "none";
+        _Wostream << L"none";
         break;
     case line_type::Single:
-        _Wostream << "single";
+        _Wostream << L"single";
         break;
     case line_type::Double:
-        _Wostream << "double";
+        _Wostream << L"double";
         break;
     default:
         break;
diff --git a/OdfFile/DataTypes/linewidth.cpp b/OdfFile/DataTypes/linewidth.cpp
index c5f5242239..9c556e84b1 100644
--- a/OdfFile/DataTypes/linewidth.cpp
+++ b/OdfFile/DataTypes/linewidth.cpp
@@ -41,25 +41,25 @@ std::wostream & operator << (std::wostream & _Wostream, const line_width & _Val)
     switch(_Val.get_type())
     {
     case line_width::Auto:
-        _Wostream << "auto";
+        _Wostream << L"auto";
         break;
     case line_width::Normal:
-        _Wostream << "normal";
+        _Wostream << L"normal";
         break;
     case line_width::Bold:
-        _Wostream << "bold";
+        _Wostream << L"bold";
         break;
     case line_width::Thin:
-        _Wostream << "thin";
+        _Wostream << L"thin";
         break;
     case line_width::Dash:
-        _Wostream << "dash";
+        _Wostream << L"dash";
         break;
     case line_width::Medium:
-        _Wostream << "medium";
+        _Wostream << L"medium";
         break;
     case line_width::Thick:
-        _Wostream << "thick";
+        _Wostream << L"thick";
         break;
     case line_width::PositiveInteger:
         _Wostream << _Val.get_positive_integer();
diff --git a/OdfFile/DataTypes/officevaluetype.cpp b/OdfFile/DataTypes/officevaluetype.cpp
index ebfccd6966..a4d3b084a1 100644
--- a/OdfFile/DataTypes/officevaluetype.cpp
+++ b/OdfFile/DataTypes/officevaluetype.cpp
@@ -34,9 +34,12 @@
 #include "officevaluetype.h"
 #include "../Common/errors.h"
 
+#include <ostream>
+#include <sstream>
+
 namespace cpdoccore { namespace odf_types { 
 
-std::wostream & operator << (std::wostream & _Wostream, const office_value_type & _Val)
+std::wostream& operator << (std::wostream& _Wostream, const office_value_type& _Val)
 {
     switch(_Val.get_type())
     {
@@ -46,27 +49,29 @@ std::wostream & operator << (std::wostream & _Wostream, const office_value_type
     case office_value_type::Float:
     case office_value_type::Scientific:
 	case office_value_type::Fraction:
-       _Wostream << "float";
-        break;
+    {
+        _Wostream << L"float";
+    } break;
     case office_value_type::Currency:
-        _Wostream << "currency";
+        _Wostream << L"currency";
         break;
     case office_value_type::Percentage:
-        _Wostream << "percentage";
+        _Wostream << L"percentage";
         break;
 	case office_value_type::Date:
 	case office_value_type::DateTime:
-		_Wostream << "date";
+		_Wostream << L"date";
         break;	
  	case office_value_type::Time:
-        _Wostream << "time";
+        _Wostream << L"time";
         break;	
 	case office_value_type::Boolean:
-        _Wostream << "boolean";
+        _Wostream << L"boolean";
         break;	
 	case office_value_type::String:
-        _Wostream << "string";
-        break;	
+    {
+        _Wostream << L"string";
+    }break;
     default:
         break;
     }
diff --git a/OdfFile/DataTypes/targetframename.cpp b/OdfFile/DataTypes/targetframename.cpp
index d35c3e031f..3743b9731a 100644
--- a/OdfFile/DataTypes/targetframename.cpp
+++ b/OdfFile/DataTypes/targetframename.cpp
@@ -45,16 +45,16 @@ std::wostream & operator << (std::wostream & _Wostream, const target_frame_name
     {
     default:
     case target_frame_name::Self:
-        _Wostream << "_self";
+        _Wostream << L"_self";
         break;
     case target_frame_name::Blank:
-        _Wostream << "_blank";
+        _Wostream << L"_blank";
         break;
     case target_frame_name::Parent:
-        _Wostream << "_parent";
+        _Wostream << L"_parent";
         break;
     case target_frame_name::Top:
-        _Wostream << "_top";
+        _Wostream << L"_top";
         break;
     case target_frame_name::String:
         _Wostream << _Val.get_name();
diff --git a/OdfFile/DataTypes/xlink.cpp b/OdfFile/DataTypes/xlink.cpp
index 5fedfc8223..153af9aaef 100644
--- a/OdfFile/DataTypes/xlink.cpp
+++ b/OdfFile/DataTypes/xlink.cpp
@@ -55,11 +55,11 @@ std::wostream & operator << (std::wostream & _Wostream, const xlink_actuate & _A
     switch (_Actuate.get_type())
     {
     case xlink_actuate::OnLoad:
-        _Wostream << "onLoad";   
+        _Wostream << L"onLoad";   
 		break;
 	default:
     case xlink_actuate::OnRequest:
-        _Wostream << "onRequest";
+        _Wostream << L"onRequest";
         break;
     }
     return _Wostream;
diff --git a/OdfFile/Writer/Format/office_meta.cpp b/OdfFile/Writer/Format/office_meta.cpp
index 4574c33cbe..507992192f 100644
--- a/OdfFile/Writer/Format/office_meta.cpp
+++ b/OdfFile/Writer/Format/office_meta.cpp
@@ -229,7 +229,7 @@ void meta_user_defined::serialize(std::wostream & _Wostream)
 		CP_XML_NODE_SIMPLE()
 		{
 			CP_XML_ATTR(L"meta:name", meta_name_);
-			CP_XML_ATTR(L"meta:value-type", meta_value_type_);
+			CP_XML_ATTR_OPT(L"meta:value-type", meta_value_type_);
 
 			CP_XML_STREAM() << XmlUtils::EncodeXmlString(content_);
 		}