Fix border issues