Borderfix

Brought in from the edges.