Fix links and tables