few more windows adaptions