Further padding changes.