WIP update linker and references to 'resolved' to hit the new '_resolved'