More licence fixes