state/presence: fixing issues from review