Update to work with package changes.