[FASTFAT] Misc. fixes spotted by Thomas.