Border glitches fixed