Unify Linux and Windows behaviors