Fix polling in apps