Fix bad link and instancing