more device fixes