Border fixes
Merge branch 'border-fixes'