Additional presence fixes