Post integration & small structure fix