Fix package construction