Fix link fixes and broken import