Fixing links and includes