Couple more changes for FaFa