publish: more FF fixes

generated from commit ee38f8dd9f23ece9089f317ff86815b9e4ada6fa