More tweaks for package changes