more select polling fixes