Fixed some border issues.