Package changes for CI build