Ad and FF fixes