Fix Recover and work around broken linker