Fixes to make Win 8 tests pass and Fix #260