Fix borders on Emerald