Fix FAT parsing further
Adjust logging and a variable name (no func. changes)