fix some padding issues