Fix some padding issues