Presence fixes

Fixes #180 and #179.