Some fixes
Licences