Border fix and OS check fix