More fixes to new smartPtr macros