One or two bug fixes, particularly related to tracking users.