More fixes to our own ComPtr