More FF fixes.