Fix possible problems with BaseURI config