More padding changes.