test-and-set, poll-out fixes