Fix borders