More trigger_poll fixes.