Improve OS specific setting