fixes from windows