More fixes with licensing