Adjustments for new package layout.