[fr] fix few bugs