Dial fixes

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