fixes + baseUrl, basePath support