diff --git a/include/etl/file_error_numbers.h b/include/etl/file_error_numbers.h
index 7d6a0e1a..b0500c48 100644
--- a/include/etl/file_error_numbers.h
+++ b/include/etl/file_error_numbers.h
@@ -100,5 +100,5 @@ SOFTWARE.
 #define ETL_BIP_BUFFER_SPSC_ATOMIC_FILE_ID "67"
 #define ETL_REFERENCE_COUNTED_OBJECT_FILE_ID "68"
 #define ETL_TO_ARITHMETIC_FILE_ID "69"
-
+#define ETL_EXPECTED_FILE_ID "70"
 #endif
diff --git a/include/etl/optional.h b/include/etl/optional.h
index 9370b536..8de5197a 100644
--- a/include/etl/optional.h
+++ b/include/etl/optional.h
@@ -91,7 +91,7 @@ namespace etl
   public:
 
     optional_invalid(string_type file_name_, numeric_type line_number_)
-      : optional_exception("optional: invalid", file_name_, line_number_)
+      : optional_exception("optional:invalid", file_name_, line_number_)
     {
     }
   };
@@ -100,7 +100,7 @@ namespace etl
   /// An optional type.
   /// If the optional type is not initialised then a type is not constructed.
   /// See http://en.cppreference.com/w/cpp/utility/optional
-  ///\tparam The type to store.
+  ///\tparam T The type to store.
   ///\ingroup utilities
   //*****************************************************************************
   template <typename T, bool is_pod = etl::is_pod<T>::value>
@@ -516,6 +516,8 @@ namespace etl
 
   //*****************************************************************************
   /// For POD types.
+  ///\tparam T The type to store.
+  ///\ingroup utilities
   //*****************************************************************************
   template <typename T>
   class optional<T, true>
diff --git a/include/etl/result.h b/include/etl/result.h
index 9d79dbf4..33653c66 100644
--- a/include/etl/result.h
+++ b/include/etl/result.h
@@ -49,7 +49,7 @@ namespace etl
   /// Result type.
   //*****************************************************************************
   template <typename TValue, typename TError>
-  class result
+  class ETL_DEPRECATED result
   {
   public:
 
@@ -66,6 +66,7 @@ namespace etl
     {
     }
 
+#if ETL_CPP11_SUPPORTED
     //*******************************************
     /// Move constructor
     //*******************************************
@@ -73,6 +74,7 @@ namespace etl
       : data(etl::move(other.data))
     {
     }
+#endif
 
     //*******************************************
     // Construct from a value
@@ -85,7 +87,7 @@ namespace etl
     //*******************************************
     // Move construct from a value
     //*******************************************
-    result(TValue&& value)
+      result(TValue&& value)
       : data(etl::move(value))
     {
     }
@@ -101,10 +103,12 @@ namespace etl
     //*******************************************
     /// Move construct from error
     //*******************************************
+#if ETL_CPP11_SUPPORTED
     result(TError&& error)
       : data(etl::move(error))
     {
     }
+#endif
 
     //*******************************************
     /// Copy assign
@@ -136,11 +140,13 @@ namespace etl
     //*******************************************
     /// Move assign from value
     //*******************************************
+#if ETL_CPP11_SUPPORTED
     result& operator =(TValue&& value)
     {
       data = etl::move(value);
       return *this;
     }
+#endif
 
     //*******************************************
     /// Copy assign from error
@@ -154,11 +160,13 @@ namespace etl
     //*******************************************
     /// Move assign from error
     //*******************************************
+#if ETL_CPP11_SUPPORTED
     result& operator =(TError&& error)
     {
       data = etl::move(error);
       return *this;
     }
+#endif
 
     //*******************************************
     /// <b>true</b> if result contains a value
@@ -215,10 +223,12 @@ namespace etl
     /// Returns an rvalue reference to the error.
     /// Undefined if the result does not contain an error.
     //*******************************************
+#if ETL_CPP11_SUPPORTED
     TError&& error()
     {
       return etl::move(etl::get<TError>(etl::move(data)));
     }
+#endif
 
   private:
 
@@ -269,10 +279,12 @@ namespace etl
     //*******************************************
     /// Move construct from error
     //*******************************************
+#if ETL_CPP11_SUPPORTED
     result(TError&& err_)
       : err(etl::move(err_))
     {
     }
+#endif
 
     //*******************************************
     /// Copy assign from error
@@ -286,11 +298,13 @@ namespace etl
     //*******************************************
     /// Move assign from error
     //*******************************************
+#if ETL_CPP11_SUPPORTED
     result& operator =(TError&& err_)
     {
       err = etl::move(err_);
       return *this;
     }
+#endif
 
     //*******************************************
     /// <b>true</b> if result contains a value
@@ -321,10 +335,12 @@ namespace etl
     /// Returns an rvalue reference to the error.
     /// Undefined if the result does not contain an error.
     //*******************************************
+#if ETL_CPP11_SUPPORTED
     TError&& error()
     {
       return etl::move(err);
     }
+#endif
 
   private:
 
diff --git a/test/vs2019/etl.vcxproj.filters b/test/vs2019/etl.vcxproj.filters
index e6c75e07..1f0ab436 100644
--- a/test/vs2019/etl.vcxproj.filters
+++ b/test/vs2019/etl.vcxproj.filters
@@ -345,9 +345,6 @@
     <ClInclude Include="..\..\include\etl\io_port.h">
       <Filter>ETL\Utilities</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\etl\optional.h">
-      <Filter>ETL\Containers</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\etl\set.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
@@ -1344,6 +1341,9 @@
     <ClInclude Include="..\..\include\etl\expected.h">
       <Filter>ETL\Containers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\etl\optional.h">
+      <Filter>ETL\Utilities</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\test_string_char.cpp">
@@ -2192,9 +2192,6 @@
     <ClCompile Include="..\test_random.cpp">
       <Filter>Tests\Maths</Filter>
     </ClCompile>
-    <ClCompile Include="..\test_optional.cpp">
-      <Filter>Tests\Containers</Filter>
-    </ClCompile>
     <ClCompile Include="..\test_error_handler.cpp">
       <Filter>Tests\Errors</Filter>
     </ClCompile>
@@ -3392,6 +3389,9 @@
     <ClCompile Include="..\sanity-check\to_arithmetic.h.t.cpp">
       <Filter>Tests\Sanity Checks\Source</Filter>
     </ClCompile>
+    <ClCompile Include="..\test_optional.cpp">
+      <Filter>Tests\Misc</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\library.properties">