Merge fixes for packaging.