Fix for windows failure modes