more FF fixes