Fix link and headers (hopefully)