border-box support and fixes