more bug fixes for fr