More minor updates to getBaseUrl