Final adjustments to comply with model spec