Fix issues with retrieving the user events