Fixes to Border Mixin