Padding improvements