Border color fixes