Fix package containment