More baseurl fixing.