Re #173, avatar invite/waiting fixes