fix device monitor bugs