some additional padding fixes