Fix issues with package change.