Shared pointer fixes
minor upds.