Improve OS compatibility