More Base URL updates