Fix some Selendroid bugs