Fixed errors reported by Win64 auto-tester