Device list bug fixes