Backports two reference counting bugfixes from master.

Many thanks two the reporters who also provided the fixes:

• @DanBarzilian
• @lostmsu