Minor fix and lowered poll() timeout