licensing, minor package fixes