fixing more windows issues