Device: Make capability listing more robust