** fix the wrong resolution key,  ** remove some warnings