FRV: Miscellaneous fixes