add fixes for poll