fixes from windows testing