fix some selendroid issues

working on #641