Fix resolver test build for win32; fix some minor flaws in resolver implementation