name resolve fixes