link fixes in base