Some package changes