Fixes some padding issues