License fix-ups