Few minor changes to props and #poll