Fixing issues running the poller