fixes for windows 8 to pass unit tests