Small fixes for polling options