Minor package changes