Some minor fix
Merge branch 'master' of https://github.com/Scuola247/Desktop