Fixes for borders