diff --git a/cql3/column_identifier.hh b/cql3/column_identifier.hh
index 7550fbae72..f493d120b7 100644
--- a/cql3/column_identifier.hh
+++ b/cql3/column_identifier.hh
@@ -180,12 +180,17 @@ column_definition* get_column_definition(schema_ptr schema, column_identifier& i
     return schema->get_column_definition(id.bytes_);
 }
 
+static inline
+::shared_ptr<column_identifier> to_identifier(const column_definition& def) {
+    return def.column_specification->name;
+}
+
 static inline
 std::vector<::shared_ptr<column_identifier>> to_identifiers(const std::vector<const column_definition*>& defs) {
     std::vector<::shared_ptr<column_identifier>> r;
     r.reserve(defs.size());
     for (auto&& def : defs) {
-        r.push_back(def->column_specification->name);
+        r.push_back(to_identifier(*def));
     }
     return r;
 }
diff --git a/tuple.hh b/tuple.hh
index 0d1ce4ede6..7a221cbeb6 100644
--- a/tuple.hh
+++ b/tuple.hh
@@ -34,6 +34,8 @@ public:
             }))
     { }
 
+    tuple_type(tuple_type&&) = default;
+
     prefix_type as_prefix() {
         return prefix_type(_types);
     }