Another attempt at fixing links and files