Fixes for padding.