Update for fat32 devices
Update for rider21