Try to fix some border problems.