Fix more issues regarding baseurl path