URL fixes to 4.1 Common