Fixed a few padding issues