more licensing fixes