Fix advertise error on create/remove/update