License fixes and updates