Fix device availablity