FRV: Fix linkage problems