Fix border issues on OSX