Added missing fixup & removed wait loop from poll.