Making a few package changes