License
Fixes and fixes