Fixes 2 of the remaining 4 fails on the MK fails on Windows platform