FF fixes, other minor