Some more minor adjustments to getBaseUrl