More spec adjustments