Added MapInitialized + baseUrl various places