More URL fixes.