Presence API bug fixing