Poll control fixes