additions from windows testing