A few more padding changes.