Fixed more link problems