Fixed more baseurl problems