Merge "More fixes about padding"