Tiny tweaks with linking and the such