Fixes for fr