Lots of fixes for regressions and some more new licenses