CLEARWATER: Licensing fixes