Licensing fixes.