Syncing up package repo changes

Some changes made to the packages repo that aren't reflected in the main repo.