C++11 std::shared_ptr fixes.