fixed device resolver bugs