Fix package change leftovers