- Fix presence handling