basePath fixes