Fix some issue with device listing...