Updated after FF fixes from Rik.