Dial fixes

* [x] - #372 
* [x] - #371