Fix presence and subscription