License and fixes