More Padding Fixes

Notices a few more whoopsies when comparing code.