Minor FR fixes