Another try at fixing bad link errors