various fixes to poll-and-call