move semantics fixes