[fr] fix errors introduced by master->3.0 merge