Minor changes to FaF.