Pegasus and CIFS fix for the rest of the devices