diff --git a/include/sqlpp11/basic_expression_operators.h b/include/sqlpp11/basic_expression_operators.h
index 95fa59ca..1d9928db 100644
--- a/include/sqlpp11/basic_expression_operators.h
+++ b/include/sqlpp11/basic_expression_operators.h
@@ -123,6 +123,13 @@ namespace sqlpp
                                 Expr,
                                 wrap_operand_t<T>>;
 
+// workaround for msvs bug 
+//	template <template <typename Lhs, typename... Rhs> class NewExpr, typename... T>
+//    using _new_nary_expression_t =
+//        new_nary_expression_t<logic::all_t<check_rhs_comparison_operand_t<ValueType, wrap_operand_t<T>>::value...>,
+//                              NewExpr,
+//                              Expr,
+//                              wrap_operand_t<T>...>;
     template <template <typename Lhs, typename... Rhs> class NewExpr, typename... T>
     struct _new_nary_expression
 	{
@@ -208,6 +215,13 @@ namespace sqlpp
     }
 
     // Hint: use value_list wrapper for containers...
+// workaround for msvs bug 
+//	template <typename... T>
+//	_new_nary_expression_t<in_t, T...> in(T... t) const
+//	{
+//		check_rhs_in_arguments_t<ValueType, wrap_operand_t<T>...>::_();
+//		return {*static_cast<const Expr*>(this), wrap_operand_t<T>{t}...};
+//	}
     template <typename... T>
 	typename _new_nary_expression<in_t, T...>::type in(T... t) const
     {
@@ -215,6 +229,13 @@ namespace sqlpp
       return {*static_cast<const Expr*>(this), typename wrap_operand<T>::type{t}...};
     }
 
+// workaround for msvs bug 
+//	template <typename... T>
+//	_new_nary_expression_t<not_in_t, T...> not_in(T... t) const
+//	{
+//		check_rhs_in_arguments_t<ValueType, wrap_operand_t<T>...>::_();
+//		return {*static_cast<const Expr*>(this), wrap_operand_t<T>{t}...};
+//	}
     template <typename... T>
 	typename _new_nary_expression<not_in_t, T...>::type not_in(T... t) const
     {
diff --git a/include/sqlpp11/column.h b/include/sqlpp11/column.h
index ba06175b..f2b6391a 100644
--- a/include/sqlpp11/column.h
+++ b/include/sqlpp11/column.h
@@ -104,6 +104,19 @@ namespace sqlpp
     }
   };
 
+// workaround for msvs bug https://connect.microsoft.com/VisualStudio/feedback/details/2173053
+//  template <typename Context, typename... Args>
+//  struct serializer_t<Context, column_t<Args...>>
+//  {
+//	  using _serialize_check = consistent_t;
+//	  using T = column_t<Args...>;
+//
+//	  static Context& _(const T&, Context& context)
+//	  {
+//		  context << name_of<typename T::_table>::char_ptr() << '.' << name_of<T>::char_ptr();
+//		  return context;
+//	  }
+//  };
   template <typename Context, typename Args1, typename Args2>
   struct serializer_t<Context, column_t<Args1, Args2>>
   {
diff --git a/include/sqlpp11/cte.h b/include/sqlpp11/cte.h
index bafba93f..8b1505f9 100644
--- a/include/sqlpp11/cte.h
+++ b/include/sqlpp11/cte.h
@@ -123,6 +123,10 @@ namespace sqlpp
   template <typename AliasProvider, typename Statement>
   using make_cte_t = typename make_cte_impl<AliasProvider, Statement, get_result_row_t<Statement>>::type;
 
+// workaround for msvc unknown internal error
+//  template <typename AliasProvider, typename Statement, typename... FieldSpecs>
+//  struct cte_t
+//	  : public member_t<cte_column_spec_t<FieldSpecs>, column_t<AliasProvider, cte_column_spec_t<FieldSpecs>>>...
   template <typename AliasProvider, typename FieldSpec>
   struct cte_base
   {
@@ -143,6 +147,9 @@ namespace sqlpp
 
     using _column_tuple_t = std::tuple<column_t<AliasProvider, cte_column_spec_t<FieldSpecs>>...>;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2086629
+//	template <typename... T>
+//	using _check = logic::all_t<is_statement_t<T>::value...>;
     template <typename... T>
 	struct _check : logic::all_t<is_statement_t<T>::value...>{};
 
diff --git a/include/sqlpp11/data_types/text/like.h b/include/sqlpp11/data_types/text/like.h
index a2e36f06..55bfe441 100644
--- a/include/sqlpp11/data_types/text/like.h
+++ b/include/sqlpp11/data_types/text/like.h
@@ -45,7 +45,9 @@ namespace sqlpp
 
     struct _alias_t
     {
-      static constexpr const char _literal[6] = "like_";
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2100550
+//      static constexpr const char _literal[] = "like_";
+	  static constexpr const char _literal[6] = "like_";
       using _name_t = sqlpp::make_char_sequence<sizeof(_literal), _literal>;
       template <typename T>
       struct _member_t
diff --git a/include/sqlpp11/detail/type_set.h b/include/sqlpp11/detail/type_set.h
index 25c27fac..d5af34ae 100644
--- a/include/sqlpp11/detail/type_set.h
+++ b/include/sqlpp11/detail/type_set.h
@@ -247,6 +247,7 @@ namespace sqlpp
     template <template <typename> class Transformation, typename T>
     using transform_set_t = typename transform_set<Transformation, T>::type;
 	
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/feedback/details/2173198
 	template <typename T>
 	struct make_name_of_set
 	{
diff --git a/include/sqlpp11/expression_fwd.h b/include/sqlpp11/expression_fwd.h
index 1299e2b3..9b771a57 100644
--- a/include/sqlpp11/expression_fwd.h
+++ b/include/sqlpp11/expression_fwd.h
@@ -236,12 +236,14 @@ namespace sqlpp
     };
   }
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2086629
   template <typename Expr>
   using lhs = detail::lhs_impl<Expr>;
 
   template <typename Expr>
   using lhs_t = typename detail::lhs_impl<Expr>::type;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2086629
   template <typename Expr>
   using rhs = detail::rhs_impl<Expr>;
 
diff --git a/include/sqlpp11/extra_tables.h b/include/sqlpp11/extra_tables.h
index d434c768..de791f25 100644
--- a/include/sqlpp11/extra_tables.h
+++ b/include/sqlpp11/extra_tables.h
@@ -63,6 +63,7 @@ namespace sqlpp
     template <typename Policies>
     struct _impl_t
     {
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
 	  _impl_t() = default;
 	  _impl_t(const _data_t &data) : _data(data){}
 
@@ -75,6 +76,7 @@ namespace sqlpp
     {
       using _data_t = extra_tables_data_t<Tables...>;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
 	  template<typename ...Args>
 	  _base_t(Args&& ...args) : extra_tables{std::forward<Args>(args)...} {}
 	  
@@ -111,6 +113,7 @@ namespace sqlpp
     template <typename Policies>
     struct _impl_t
     {
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
 	  _impl_t() = default;
 	  _impl_t(const _data_t &data) : _data(data){}
 
@@ -123,6 +126,7 @@ namespace sqlpp
     {
       using _data_t = no_data_t;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
 	  template<typename ...Args>
 	  _base_t(Args&& ...args) : no_extra_tables{std::forward<Args>(args)...} {}
 
@@ -145,6 +149,9 @@ namespace sqlpp
       template <typename Check, typename T>
       using _new_statement_t = new_statement_t<Check::value, Policies, no_extra_tables_t, T>;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
+//	  template <typename... T>
+//	  using _check = logic::all_t<is_table_t<T>::value...>;
       template <typename... T>
 	  struct _check : logic::all_t<is_table_t<T>::value...>{};
 
@@ -171,6 +178,8 @@ namespace sqlpp
 
         static constexpr std::size_t _number_of_tables = detail::sum(provided_tables_of<Tables>::size::value...);
         using _unique_tables = detail::make_joined_set_t<provided_tables_of<Tables>...>;
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/feedback/details/2173198
+//		using _unique_table_names = detail::transform_set_t<name_of, _unique_tables>;
         using _unique_table_names = detail::make_name_of_set_t<_unique_tables>;
         static_assert(_number_of_tables == _unique_tables::size::value,
                       "at least one duplicate table detected in extra_tables()");
diff --git a/include/sqlpp11/from.h b/include/sqlpp11/from.h
index 81aa3b6f..38249de8 100644
--- a/include/sqlpp11/from.h
+++ b/include/sqlpp11/from.h
@@ -71,6 +71,7 @@ namespace sqlpp
     template <typename Policies>
     struct _impl_t
     {
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
 	  _impl_t() = default;
 	  _impl_t(const _data_t &data) : _data(data){}
 
@@ -81,6 +82,8 @@ namespace sqlpp
         static_assert(is_table_t<Table>::value, "invalid table argument in from::add()");
         using _known_tables =
             detail::make_joined_set_t<provided_tables_of<Tables>...>;  // Hint: Joins contain more than one table
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/feedback/details/2173198
+//		using _known_table_names = detail::transform_set_t<name_of, _known_tables>;
         using _known_table_names = detail::make_name_of_set_t<_known_tables>;
         static_assert(not detail::is_element_of<typename Table::_alias_t, _known_table_names>::value,
                       "Must not use the same table name twice in from()");
@@ -112,6 +115,7 @@ namespace sqlpp
     {
       using _data_t = from_data_t<Database, Tables...>;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
 	  template<typename ...Args>
 	  _base_t(Args&& ...args) : from{std::forward<Args>(args)...} {}
 
@@ -148,6 +152,7 @@ namespace sqlpp
     template <typename Policies>
     struct _impl_t
     {
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
 	  _impl_t() = default;
 	  _impl_t(const _data_t &data) : _data(data){}
 
@@ -160,6 +165,7 @@ namespace sqlpp
     {
       using _data_t = no_data_t;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
 	  template<typename ...Args>
 	  _base_t(Args&& ...args) : no_from{std::forward<Args>(args)...} {}
 
@@ -181,6 +187,9 @@ namespace sqlpp
 
       using _database_t = typename Policies::_database_t;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
+//	  template <typename... T>
+//	  using _check = logic::all_t<is_table_t<T>::value...>;
       template <typename... T>
 	  struct _check : logic::all_t<is_table_t<T>::value...> {};
 
diff --git a/include/sqlpp11/group_by.h b/include/sqlpp11/group_by.h
index 51410564..0b1e9891 100644
--- a/include/sqlpp11/group_by.h
+++ b/include/sqlpp11/group_by.h
@@ -86,6 +86,7 @@ namespace sqlpp
     template <typename Policies>
     struct _impl_t
     {
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
 	  _impl_t() = default;
 	  _impl_t(const _data_t &data) : _data(data){}
 	  
@@ -130,6 +131,7 @@ namespace sqlpp
     {
       using _data_t = group_by_data_t<Database, Expressions...>;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
 	  template<typename ...Args>
 	  _base_t(Args&& ...args) : group_by{std::forward<Args>(args)...} {}
 
@@ -168,6 +170,7 @@ namespace sqlpp
     template <typename Policies>
     struct _impl_t
     {
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
 	  _impl_t() = default;
 	  _impl_t(const _data_t &data) : _data(data){}
 
@@ -180,6 +183,7 @@ namespace sqlpp
     {
       using _data_t = no_data_t;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
 	  template<typename ...Args>
 	  _base_t(Args&& ...args) : no_group_by{std::forward<Args>(args)...} {}
 
@@ -201,6 +205,9 @@ namespace sqlpp
 
       using _database_t = typename Policies::_database_t;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
+//	  template <typename... T>
+//	  using _check = logic::all_t<is_expression_t<T>::value...>;
       template <typename... T>
 	  struct _check : logic::all_t<is_expression_t<T>::value...> {};
 
diff --git a/include/sqlpp11/having.h b/include/sqlpp11/having.h
index 1c83252b..bfaae2c4 100644
--- a/include/sqlpp11/having.h
+++ b/include/sqlpp11/having.h
@@ -82,6 +82,7 @@ namespace sqlpp
     template <typename Policies>
     struct _impl_t
     {
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
 	  _impl_t() = default;
 	  _impl_t(const _data_t &data) : _data(data){}
 
@@ -126,6 +127,7 @@ namespace sqlpp
     {
       using _data_t = having_data_t<Database, Expressions...>;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
 	  template<typename ...Args>
 	  _base_t(Args&& ...args) : having{std::forward<Args>(args)...} {}
 
@@ -164,6 +166,7 @@ namespace sqlpp
     template <typename Policies>
     struct _impl_t
     {
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
 	  _impl_t() = default;
 	  _impl_t(const _data_t &data) : _data(data){}
 
@@ -176,6 +179,7 @@ namespace sqlpp
     {
       using _data_t = no_data_t;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
 	  template<typename ...Args>
 	  _base_t(Args&& ...args) : no_having{std::forward<Args>(args)...} {}
 
@@ -197,6 +201,9 @@ namespace sqlpp
 
       using _database_t = typename Policies::_database_t;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
+//	  template <typename... T>
+//	  using _check = logic::all_t<is_expression_t<T>::value...>;
       template <typename... T>
 	  struct _check : logic::all_t<is_expression_t<T>::value...> {};
 
diff --git a/include/sqlpp11/insert_value_list.h b/include/sqlpp11/insert_value_list.h
index dd07a9ff..a800b30b 100644
--- a/include/sqlpp11/insert_value_list.h
+++ b/include/sqlpp11/insert_value_list.h
@@ -78,6 +78,7 @@ namespace sqlpp
     template <typename Policies>
     struct _impl_t
     {
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
 	  _impl_t() = default;
 	  _impl_t(const _data_t &data) : _data(data){}
 
@@ -90,6 +91,7 @@ namespace sqlpp
     {
       using _data_t = insert_default_values_data_t;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
 	  template<typename ...Args>
 	  _base_t(Args&& ...args) : default_values{std::forward<Args>(args)...} {}
 	  
@@ -148,6 +150,17 @@ namespace sqlpp
   SQLPP_PORTABLE_STATIC_ASSERT(assert_insert_dynamic_set_statement_dynamic_t,
                                "dynamic_set must not be called in a static statement");
 
+// workaround for msvc bugs https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269 & https://connect.microsoft.com/VisualStudio/Feedback/Details/2173198
+//  template <typename... Assignments>
+//  using check_insert_set_t = static_combined_check_t<
+//      static_check_t<logic::all_t<is_assignment_t<Assignments>::value...>::value, assert_insert_set_assignments_t>,
+//      static_check_t<not detail::has_duplicates<lhs_t<Assignments>...>::value, assert_insert_set_no_duplicates_t>,
+//      static_check_t<logic::none_t<must_not_insert_t<lhs_t<Assignments>>::value...>::value,
+//                     assert_insert_set_prohibited_t>,
+//      static_check_t<sizeof...(Assignments) == 0 or
+//                         detail::make_joined_set_t<required_tables_of<lhs_t<Assignments>>...>::size::value == 1,
+//                     assert_insert_set_one_table_t>>;
+
   template <typename Expr>
   struct must_not_insert
   {
@@ -164,6 +177,13 @@ namespace sqlpp
                          detail::make_joined_set_t<required_tables_of<typename lhs<Assignments>::type>...>::size::value == 1,
                      assert_insert_set_one_table_t>>;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
+//  template <typename... Assignments>
+//  using check_insert_static_set_t =
+//      static_combined_check_t<check_insert_set_t<Assignments...>,
+//                              static_check_t<sizeof...(Assignments) != 0, assert_insert_static_set_count_args_t>,
+//                              static_check_t<detail::have_all_required_columns<lhs_t<Assignments>...>::value,
+//                                             assert_insert_static_set_all_required_t>>;
   template <typename... Assignments>
   struct check_insert_static_set
   {
@@ -176,6 +196,11 @@ namespace sqlpp
   template <typename... Assignments>
   using check_insert_static_set_t = typename check_insert_static_set<Assignments...>::type;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
+//  template <typename Database, typename... Assignments>
+//  using check_insert_dynamic_set_t = static_combined_check_t<
+//      static_check_t<not std::is_same<Database, void>::value, assert_insert_dynamic_set_statement_dynamic_t>,
+//      check_insert_set_t<Assignments...>>;
   template <typename Database, typename... Assignments>
   struct check_insert_dynamic_set
   {
@@ -211,6 +236,7 @@ namespace sqlpp
     template <typename Policies>
     struct _impl_t
     {
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
 	  _impl_t() = default;
 	  _impl_t(const _data_t &data) : _data(data){}
 
@@ -260,6 +286,7 @@ namespace sqlpp
     {
       using _data_t = insert_list_data_t<Database, Assignments...>;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
 	  template<typename ...Args>
 	  _base_t(Args&& ...args) : insert_list{std::forward<Args>(args)...} {}
 
@@ -288,6 +315,7 @@ namespace sqlpp
   template <typename... Columns>
   struct column_list_data_t
   {
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
     column_list_data_t(Columns... cols) : _columns(simple_column_t<Columns>(cols)...)
     {
     }
@@ -330,6 +358,7 @@ namespace sqlpp
     template <typename Policies>
     struct _impl_t
     {
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
 	  _impl_t() = default;
 	  _impl_t(const _data_t &data) : _data(data){}
 
@@ -367,6 +396,7 @@ namespace sqlpp
     {
       using _data_t = column_list_data_t<Columns...>;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
 	  template<typename ...Args>
 	  _base_t(Args&& ...args) : values{std::forward<Args>(args)...} {}
 
@@ -416,6 +446,7 @@ namespace sqlpp
     template <typename Policies>
     struct _impl_t
     {
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
 	  _impl_t() = default;
 	  _impl_t(const _data_t &data) : _data(data){}
 
@@ -428,6 +459,7 @@ namespace sqlpp
     {
       using _data_t = no_data_t;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
 	  template<typename ...Args>
 	  _base_t(Args&& ...args) : no_insert_values{std::forward<Args>(args)...} {}
 
@@ -449,6 +481,9 @@ namespace sqlpp
 
       using _database_t = typename Policies::_database_t;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
+//	  template <typename... T>
+//	  using _column_check = logic::all_t<is_column_t<T>::value...>;
       template <typename... T>
 	  struct _column_check : logic::all_t<is_column_t<T>::value...> {};
 
diff --git a/include/sqlpp11/into.h b/include/sqlpp11/into.h
index 7b41e2a2..ef8b5200 100644
--- a/include/sqlpp11/into.h
+++ b/include/sqlpp11/into.h
@@ -71,6 +71,7 @@ namespace sqlpp
     template <typename Policies>
     struct _impl_t
     {
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
 	  _impl_t() = default;
 	  _impl_t(const _data_t &data) : _data(data){}
 
@@ -83,6 +84,7 @@ namespace sqlpp
     {
       using _data_t = into_data_t<Database, Table>;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
 	  template<typename ...Args>
 	  _base_t(Args&& ...args) : into{std::forward<Args>(args)...} {}
 
diff --git a/include/sqlpp11/limit.h b/include/sqlpp11/limit.h
index 06ff7707..5b8f511c 100644
--- a/include/sqlpp11/limit.h
+++ b/include/sqlpp11/limit.h
@@ -64,6 +64,7 @@ namespace sqlpp
     template <typename Policies>
     struct _impl_t
     {
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
 	  _impl_t() = default;
 	  _impl_t(const _data_t &data) : _data(data){}
 
@@ -76,6 +77,7 @@ namespace sqlpp
     {
       using _data_t = limit_data_t<Limit>;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
 	  template<typename ...Args>
 	  _base_t(Args&& ...args) : limit{std::forward<Args>(args)...} {}
 
@@ -137,6 +139,7 @@ namespace sqlpp
     template <typename Policies>
     struct _impl_t
     {
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
 	  _impl_t() = default;
 	  _impl_t(const _data_t &data) : _data(data){}
 
@@ -160,6 +163,7 @@ namespace sqlpp
     {
       using _data_t = dynamic_limit_data_t<Database>;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
 	  template<typename ...Args>
 	  _base_t(Args&& ...args) : limit{std::forward<Args>(args)...} {}
 
@@ -195,6 +199,7 @@ namespace sqlpp
     template <typename Policies>
     struct _impl_t
     {
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
 	  _impl_t() = default;
 	  _impl_t(const _data_t &data) : _data(data){}
 
@@ -207,6 +212,7 @@ namespace sqlpp
     {
       using _data_t = no_data_t;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
 	  template<typename ...Args>
 	  _base_t(Args&& ...args) : no_limit{std::forward<Args>(args)...} {}
 
diff --git a/include/sqlpp11/logic.h b/include/sqlpp11/logic.h
index 894a50aa..a36694bd 100644
--- a/include/sqlpp11/logic.h
+++ b/include/sqlpp11/logic.h
@@ -38,6 +38,8 @@ namespace sqlpp
     struct logic_helper;
 
     // see http://lists.boost.org/Archives/boost/2014/05/212946.php :-)
+
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2086629
 	template <bool... B>
 	struct all
 	{
@@ -47,6 +49,7 @@ namespace sqlpp
     template <bool... B>
     using all_t = std::is_same<logic_helper<B...>, logic_helper<(B or true)...>>;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2086629
 	template <bool... B>
 	struct any
 	{
diff --git a/include/sqlpp11/offset.h b/include/sqlpp11/offset.h
index 7f6c27d8..00155c5b 100644
--- a/include/sqlpp11/offset.h
+++ b/include/sqlpp11/offset.h
@@ -66,6 +66,7 @@ namespace sqlpp
     template <typename Policies>
     struct _impl_t
     {
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
 	  _impl_t() = default;
 	  _impl_t(const _data_t &data) : _data(data){}
 
@@ -78,6 +79,7 @@ namespace sqlpp
     {
       using _data_t = offset_data_t<Offset>;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
 	  template<typename ...Args>
 	  _base_t(Args&& ...args) : offset{std::forward<Args>(args)...} {}
 
@@ -139,6 +141,7 @@ namespace sqlpp
     template <typename Policies>
     struct _impl_t
     {
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
 	  _impl_t() = default;
 	  _impl_t(const _data_t &data) : _data(data){}
 
@@ -162,6 +165,7 @@ namespace sqlpp
     {
       using _data_t = dynamic_offset_data_t<Database>;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
 	  template<typename ...Args>
 	  _base_t(Args&& ...args) : offset{std::forward<Args>(args)...} {}
 
@@ -209,6 +213,7 @@ namespace sqlpp
     template <typename Policies>
     struct _impl_t
     {
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
 	  _impl_t() = default;
 	  _impl_t(const _data_t &data) : _data(data){}
 
@@ -221,6 +226,7 @@ namespace sqlpp
     {
       using _data_t = no_data_t;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
 	  template<typename ...Args>
 	  _base_t(Args&& ...args) : no_offset{std::forward<Args>(args)...} {}
 
diff --git a/include/sqlpp11/order_by.h b/include/sqlpp11/order_by.h
index 8b496831..23c32984 100644
--- a/include/sqlpp11/order_by.h
+++ b/include/sqlpp11/order_by.h
@@ -83,6 +83,7 @@ namespace sqlpp
     template <typename Policies>
     struct _impl_t
     {
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
 	  _impl_t() = default;
 	  _impl_t(const _data_t &data) : _data(data){}
 
@@ -127,6 +128,7 @@ namespace sqlpp
     {
       using _data_t = order_by_data_t<Database, Expressions...>;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
 	  template<typename ...Args>
 	  _base_t(Args&& ...args) : order_by{std::forward<Args>(args)...} {}
 
@@ -165,6 +167,7 @@ namespace sqlpp
     template <typename Policies>
     struct _impl_t
     {
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
 	  _impl_t() = default;
 	  _impl_t(const _data_t &data) : _data(data){}
 
@@ -177,6 +180,7 @@ namespace sqlpp
     {
       using _data_t = no_data_t;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2091069
 	  template<typename ...Args>
 	  _base_t(Args&& ...args) : no_order_by{std::forward<Args>(args)...} {}
 
@@ -198,6 +202,9 @@ namespace sqlpp
 
       using _database_t = typename Policies::_database_t;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
+//	  template <typename... T>
+//	  using _check = logic::all_t<is_sort_order_t<T>::value...>;
       template <typename... T>
 	  struct _check : logic::all_t<is_sort_order_t<T>::value...> {};
 
diff --git a/include/sqlpp11/select_column_list.h b/include/sqlpp11/select_column_list.h
index f4f89c4a..ce5aba30 100644
--- a/include/sqlpp11/select_column_list.h
+++ b/include/sqlpp11/select_column_list.h
@@ -201,6 +201,7 @@ namespace sqlpp
     template <typename Policies>
     struct _impl_t
     {
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
 	  _impl_t() = default;
 	  _impl_t(const _data_t &data) : _data(data){}
 
@@ -251,6 +252,7 @@ namespace sqlpp
     {
       using _data_t = select_column_list_data_t<Database, Columns...>;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
 	  template<typename ...Args>
 	  _base_t(Args&& ...args) : selected_columns{std::forward<Args>(args)...} {}
 
@@ -403,6 +405,7 @@ namespace sqlpp
     template <typename Policies>
     struct _impl_t
     {
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
 	  _impl_t() = default;
 	  _impl_t(const _data_t &data) : _data(data){}
 
@@ -415,6 +418,7 @@ namespace sqlpp
     {
       using _data_t = no_data_t;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
 	  template<typename ...Args>
 	  _base_t(Args&& ...args) : no_selected_columns{std::forward<Args>(args)...} {}
 	  
@@ -436,6 +440,9 @@ namespace sqlpp
 
       using _database_t = typename Policies::_database_t;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
+//	  template <typename... T>
+//	  using _check = logic::all_t<(is_selectable_t<T>::value or is_multi_column_t<T>::value)...>;
       template <typename... T>
 	  struct _check : logic::all_t<(is_selectable_t<T>::value or is_multi_column_t<T>::value)...> {};
 
diff --git a/include/sqlpp11/select_flag_list.h b/include/sqlpp11/select_flag_list.h
index f167ed55..5f92f322 100644
--- a/include/sqlpp11/select_flag_list.h
+++ b/include/sqlpp11/select_flag_list.h
@@ -71,6 +71,7 @@ namespace sqlpp
     template <typename Policies>
     struct _impl_t
     {
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
 	  _impl_t() = default;
 	  _impl_t(const _data_t &data) : _data(data){}
 
@@ -115,6 +116,7 @@ namespace sqlpp
     {
       using _data_t = select_flag_list_data_t<Database, Flags...>;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
 	  template<typename ...Args>
 	  _base_t(Args&& ...args) : select_flags{std::forward<Args>(args)...} {}
 
@@ -150,6 +152,7 @@ namespace sqlpp
     template <typename Policies>
     struct _impl_t
     {
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
 	  _impl_t() = default;
 	  _impl_t(const _data_t &data) : _data(data){}
 
@@ -162,6 +165,7 @@ namespace sqlpp
     {
       using _data_t = no_data_t;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
 	  template<typename ...Args>
 	  _base_t(Args&& ...args) : no_select_flags{std::forward<Args>(args)...} {}
 
@@ -182,7 +186,10 @@ namespace sqlpp
       }
 
       using _database_t = typename Policies::_database_t;
-	  
+
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
+//	  template <typename... T>
+//	  using _check = logic::all_t<is_select_flag_t<T>::value...>;
       template <typename... T>
 	  struct _check : logic::all_t<detail::is_select_flag_impl<T>::type::value...>{};
 
diff --git a/include/sqlpp11/simple_column.h b/include/sqlpp11/simple_column.h
index ab938054..2f62bc77 100644
--- a/include/sqlpp11/simple_column.h
+++ b/include/sqlpp11/simple_column.h
@@ -38,6 +38,7 @@ namespace sqlpp
     using _column_t = Column;
     _column_t _column;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
 	simple_column_t() = default;
 	simple_column_t(const _column_t &column) : _column{column} {}
 
diff --git a/include/sqlpp11/single_table.h b/include/sqlpp11/single_table.h
index c06dcf35..9461b0bd 100644
--- a/include/sqlpp11/single_table.h
+++ b/include/sqlpp11/single_table.h
@@ -73,6 +73,7 @@ namespace sqlpp
     template <typename Policies>
     struct _impl_t
     {
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
 	  _impl_t() = default;
 	  _impl_t(const _data_t &data) : _data(data){}
 
@@ -85,6 +86,7 @@ namespace sqlpp
     {
       using _data_t = single_table_data_t<Database, Table>;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
 	  template<typename ...Args>
 	  _base_t(Args&& ...args) : from{std::forward<Args>(args)...} {}
 
diff --git a/include/sqlpp11/statement.h b/include/sqlpp11/statement.h
index 10beb56e..2431b97f 100644
--- a/include/sqlpp11/statement.h
+++ b/include/sqlpp11/statement.h
@@ -110,6 +110,11 @@ namespace sqlpp
       template <typename Expression>
       using _no_unknown_tables = detail::is_subset_of<required_tables_of<Expression>, _known_tables>;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2086629
+//	  template <typename... Expressions>
+//      using _no_unknown_aggregates =
+//          logic::any_t<_all_provided_aggregates::size::value == 0,
+//                       logic::all_t<is_aggregate_expression_t<_all_provided_aggregates, Expressions>::value...>::value>;
       template <typename... Expressions>
       using _no_unknown_aggregates =
           logic::any_t<_all_provided_aggregates::size::value == 0,
@@ -219,6 +224,13 @@ namespace sqlpp
     {
     }
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
+//	template <typename Statement, typename Term>
+//	statement_t(Statement statement, Term term)
+//		: Policies::template _base_t<_policies_t>{typename Policies::template _impl_t<_policies_t>{
+//		detail::pick_arg<typename Policies::template _base_t<_policies_t>>(statement, term)}}...
+//	{
+//	}
     template <typename Statement, typename Term>
     statement_t(Statement statement, Term term)
         : Policies::template _base_t<_policies_t>(typename Policies::template _impl_t<_policies_t>(
@@ -291,6 +303,7 @@ namespace sqlpp
     template <typename Policies>
     struct _impl_t
     {
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
 	  _impl_t() = default;
 	  _impl_t(const _data_t &data) : _data(data) {}
 
@@ -303,6 +316,7 @@ namespace sqlpp
     {
       using _data_t = NameData;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
 	  template<typename ...Args>
 	  _base_t(Args&& ...args) : statement_name{std::forward<Args>(args)...} {}
 
diff --git a/include/sqlpp11/table.h b/include/sqlpp11/table.h
index 9ff230ab..5b83c0c7 100644
--- a/include/sqlpp11/table.h
+++ b/include/sqlpp11/table.h
@@ -41,6 +41,9 @@ namespace sqlpp
   {
   };
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173198
+//  template <typename Table, typename... ColumnSpec>
+//  struct table_t : public table_base_t, public member_t<ColumnSpec, column_t<Table, ColumnSpec>>...
   template <typename Table, typename... ColumnSpec>
   struct table_t : public table_base_t, public ColumnSpec::_alias_t::template _member_t<column_t<Table, ColumnSpec>>...
   {
diff --git a/include/sqlpp11/table_alias.h b/include/sqlpp11/table_alias.h
index 68002ace..717aa168 100644
--- a/include/sqlpp11/table_alias.h
+++ b/include/sqlpp11/table_alias.h
@@ -35,6 +35,9 @@
 
 namespace sqlpp
 {
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173198
+//  template <typename AliasProvider, typename Table, typename... ColumnSpec>
+//  struct table_alias_t : public member_t<ColumnSpec, column_t<AliasProvider, ColumnSpec>>...
   template <typename AliasProvider, typename Table, typename... ColumnSpec>
   struct table_alias_t : public ColumnSpec::_alias_t::template _member_t<column_t<AliasProvider, ColumnSpec>>...
   {
diff --git a/include/sqlpp11/union.h b/include/sqlpp11/union.h
index f155733c..6de97740 100644
--- a/include/sqlpp11/union.h
+++ b/include/sqlpp11/union.h
@@ -78,6 +78,7 @@ namespace sqlpp
     template <typename Policies>
     struct _impl_t
     {
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
 	  _impl_t() = default;
 	  _impl_t(const _data_t &data) : _data(data){}
 
@@ -90,6 +91,7 @@ namespace sqlpp
     {
       using _data_t = union_data_t<Database, Flag, Lhs, Rhs>;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
 	  template<typename ...Args>
 	  _base_t(Args&& ...args) : union_{std::forward<Args>(args)...} {}
 
@@ -142,6 +144,7 @@ namespace sqlpp
     template <typename Policies>
     struct _impl_t
     {
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
 	  _impl_t() = default;
 	  _impl_t(const _data_t &data) : _data(data){}
 
@@ -154,6 +157,7 @@ namespace sqlpp
     {
       using _data_t = no_data_t;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
 	  template<typename ...Args>
 	  _base_t(Args&& ...args) : no_union{std::forward<Args>(args)...} {}
 
@@ -175,6 +179,9 @@ namespace sqlpp
 
       using _database_t = typename Policies::_database_t;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
+//	  template <typename... T>
+//	  using _check = logic::all_t<is_statement_t<T>::value...>;
       template <typename... T>
       using _check = typename logic::all<is_statement_t<T>::value...>::type;
 
diff --git a/include/sqlpp11/update_list.h b/include/sqlpp11/update_list.h
index e5c41b00..397b55fc 100644
--- a/include/sqlpp11/update_list.h
+++ b/include/sqlpp11/update_list.h
@@ -79,6 +79,7 @@ namespace sqlpp
     template <typename Policies>
     struct _impl_t
     {
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
 	  _impl_t() = default;
 	  _impl_t(const _data_t &data) : _data(data){}
 
@@ -127,6 +128,7 @@ namespace sqlpp
     {
       using _data_t = update_list_data_t<Database, Assignments...>;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
 	  template<typename ...Args>
 	  _base_t(Args&& ...args) : assignments{std::forward<Args>(args)...} {}
 
@@ -175,6 +177,7 @@ namespace sqlpp
     template <typename Policies>
     struct _impl_t
     {
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
 	  _impl_t() = default;
 	  _impl_t(const _data_t &data) : _data(data){}
 
@@ -187,6 +190,7 @@ namespace sqlpp
     {
       using _data_t = no_data_t;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
 	  template<typename ...Args>
 	  _base_t(Args&& ...args) : no_assignments{std::forward<Args>(args)...} {}
 
@@ -208,6 +212,9 @@ namespace sqlpp
 
       using _database_t = typename Policies::_database_t;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
+//	  template <typename... T>
+//	  using _check = logic::all_t<is_assignment_t<T>::value...>;
       template <typename... T>
 	  struct _check : public logic::all_t<is_assignment_t<T>::value...> {};
 
diff --git a/include/sqlpp11/using.h b/include/sqlpp11/using.h
index 4dbe001d..b1bafef0 100644
--- a/include/sqlpp11/using.h
+++ b/include/sqlpp11/using.h
@@ -69,6 +69,7 @@ namespace sqlpp
     template <typename Policies>
     struct _impl_t
     {
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
 	  _impl_t() = default;
 	  _impl_t(const _data_t &data) : _data(data){}
 
@@ -105,6 +106,7 @@ namespace sqlpp
     {
       using _data_t = using_data_t<Database, Tables...>;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
 	  template<typename ...Args>
 	  _base_t(Args&& ...args) : using_{std::forward<Args>(args)...} {}
 
@@ -142,6 +144,7 @@ namespace sqlpp
     template <typename Policies>
     struct _impl_t
     {
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
 	  _impl_t() = default;
 	  _impl_t(const _data_t &data) : _data(data){}
 
@@ -154,6 +157,7 @@ namespace sqlpp
     {
       using _data_t = no_data_t;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
 	  template<typename ...Args>
 	  _base_t(Args&& ...args) : no_using{std::forward<Args>(args)...} {}
 
@@ -175,6 +179,9 @@ namespace sqlpp
 
       using _database_t = typename Policies::_database_t;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
+//	  template <typename... T>
+//	  using _check = logic::all_t<is_table_t<T>::value...>;
       template <typename... T>
 	  struct _check : logic::all_t<is_table_t<T>::value...> {};
 
diff --git a/include/sqlpp11/where.h b/include/sqlpp11/where.h
index 78e494c1..003a573f 100644
--- a/include/sqlpp11/where.h
+++ b/include/sqlpp11/where.h
@@ -84,6 +84,7 @@ namespace sqlpp
     template <typename Policies>
     struct _impl_t
     {
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
 	  _impl_t() = default;
 	  _impl_t(const _data_t &data) : _data(data) {}
 
@@ -128,6 +129,7 @@ namespace sqlpp
     {
       using _data_t = where_data_t<Database, Expressions...>;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
 	  template<typename ...Args>
 	  _base_t(Args&& ...args) : where{std::forward<Args>(args)...} {}
 
@@ -173,6 +175,7 @@ namespace sqlpp
     template <typename Policies>
     struct _impl_t
     {
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
 	  _impl_t() = default;
 	  _impl_t(const _data_t &data) : _data(data){}
 
@@ -185,6 +188,7 @@ namespace sqlpp
     {
       using _data_t = where_data_t<void, bool>;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
 	  template<typename ...Args>
 	  _base_t(Args&& ...args) : where{std::forward<Args>(args)...} {}
 
@@ -233,6 +237,7 @@ namespace sqlpp
     template <typename Policies>
     struct _impl_t
     {
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
 	  _impl_t() = default;
 	  _impl_t(const _data_t &data) : _data(data){}
 
@@ -245,6 +250,7 @@ namespace sqlpp
     {
       using _data_t = no_data_t;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
 	  template<typename ...Args>
 	  _base_t(Args&& ...args) : no_where{std::forward<Args>(args)...} {}
 
@@ -266,6 +272,9 @@ namespace sqlpp
 
       using _database_t = typename Policies::_database_t;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
+//	  template <typename... T>
+//	  using _check = logic::all_t<is_expression_t<T>::value...>;
       template <typename... T>
 	  struct _check : logic::all_t<is_expression_t<T>::value...> {};
 
diff --git a/include/sqlpp11/with.h b/include/sqlpp11/with.h
index 35e19468..19bfd030 100644
--- a/include/sqlpp11/with.h
+++ b/include/sqlpp11/with.h
@@ -79,6 +79,7 @@ namespace sqlpp
     template <typename Policies>
     struct _impl_t
     {
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
 	  _impl_t() = default;
 	  _impl_t(const _data_t &data) : _data(data){}
 
@@ -91,6 +92,7 @@ namespace sqlpp
     {
       using _data_t = with_data_t<Database, Expressions...>;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
 	  template<typename ...Args>
 	  _base_t(Args&& ...args) : with{std::forward<Args>(args)...} {}
 
@@ -127,6 +129,7 @@ namespace sqlpp
     template <typename Policies>
     struct _impl_t
     {
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
 	  _impl_t() = default;
 	  _impl_t(const _data_t &data) : _data(data){}
 
@@ -139,6 +142,7 @@ namespace sqlpp
     {
       using _data_t = no_data_t;
 
+// workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269
 	  template<typename ...Args>
 	  _base_t(Args&& ...args) : no_with{std::forward<Args>(args)...} {}