diff --git a/include/sqlpp11/avg.h b/include/sqlpp11/avg.h
index f763a30f..dcf821b7 100644
--- a/include/sqlpp11/avg.h
+++ b/include/sqlpp11/avg.h
@@ -44,6 +44,8 @@ namespace sqlpp
 				using _is_named_expression = std::true_type;
 			};
 
+			using _table_set = typename Expr::_table_set;
+
 			struct _name_t
 			{
 				static constexpr const char* _get_name() { return "AVG"; }
diff --git a/include/sqlpp11/count.h b/include/sqlpp11/count.h
index 3e6c10ce..dc54437f 100644
--- a/include/sqlpp11/count.h
+++ b/include/sqlpp11/count.h
@@ -45,6 +45,8 @@ namespace sqlpp
 				using _is_named_expression = std::true_type;
 			};
 
+			using _table_set = typename Expr::_table_set;
+
 			struct _name_t
 			{
 				static constexpr const char* _get_name() { return "COUNT"; }
diff --git a/include/sqlpp11/exists.h b/include/sqlpp11/exists.h
index 899a460b..ac69461e 100644
--- a/include/sqlpp11/exists.h
+++ b/include/sqlpp11/exists.h
@@ -43,6 +43,8 @@ namespace sqlpp
 				using _is_named_expression = std::true_type;
 			};
 
+			using _table_set = typename Select::_table_set;
+
 			struct _name_t
 			{
 				static constexpr const char* _get_name() { return "EXISTS"; }
diff --git a/include/sqlpp11/max.h b/include/sqlpp11/max.h
index ecba9d94..a86c4b22 100644
--- a/include/sqlpp11/max.h
+++ b/include/sqlpp11/max.h
@@ -43,6 +43,8 @@ namespace sqlpp
 				using _is_named_expression = std::true_type;
 			};
 
+			using _table_set = typename Expr::_table_set;
+
 			struct _name_t
 			{
 				static constexpr const char* _get_name() { return "MAX"; }
diff --git a/include/sqlpp11/min.h b/include/sqlpp11/min.h
index ee7f4068..c7d9f9e0 100644
--- a/include/sqlpp11/min.h
+++ b/include/sqlpp11/min.h
@@ -43,6 +43,8 @@ namespace sqlpp
 				using _is_named_expression = std::true_type;
 			};
 
+			using _table_set = typename Expr::_table_set;
+
 			struct _name_t
 			{
 				static constexpr const char* _get_name() { return "MIN"; }
diff --git a/include/sqlpp11/vendor/select_column_list.h b/include/sqlpp11/vendor/select_column_list.h
index 2c3d6042..52a48045 100644
--- a/include/sqlpp11/vendor/select_column_list.h
+++ b/include/sqlpp11/vendor/select_column_list.h
@@ -183,6 +183,11 @@ namespace sqlpp
 				select_column_list_t& operator=(select_column_list_t&&) = default;
 				~select_column_list_t() = default;
 
+				static constexpr size_t static_size()
+				{
+					return size::value;
+				}
+
 				template<typename Policies>
 					struct _methods_t
 					{