Merge windows compatibility code