Minor fixes to std::move usage - still incomplete/broken - for new container stuff