Remove two further Windows bugs.
Remove two further Windows bugs.

fredrik-johansson/flint2,jpflori/flint2,dsroche/flint2,wbhart/flint2,jpflori/flint2,wbhart/flint2,jpflori/flint2,dsroche/flint2,jpflori/flint2,dsroche/flint2,dsroche/flint2,fredrik-johansson/flint2,fredrik-johansson/flint2,wbhart/flint2