More fixes for links and baseurl