Fix devices branches