More FF fixes