Fixed several more links