Code review fixes.
Padding control changes.