Fixes

I'm working on several others.
Double check: https://github.com/emanuele45/Dialogo/commit/36abbff8bfea4b10ece1aa91751d5493177c67a2