Make sure things are linked properly