Fix issues linking