Various updates around licensing