Update for proper package building.
Fix package building