Missed a few instances of std::make_shared