Fix which messages are sent during a poll