A set of additional small fixes.

A few more fixes, mostly related to 3rd party trackers and identity integration.