Short URL fixes for SDK.