Cut down many warnings and a few broken links