Merge license fixes