Fixing links and other things