More licensing fixes