Fix more inconsistent use of baseURI