Fixes for links and image uploads