CXX-265 Code review changes, auto_ptr fix