Update licenses
Deprecation fixes