Couple of fixes for vfat/fat16