Fixing links and stuff