Updated, fixed URLs

Change-Id: Ic29bc9de1182c6a10fc9505281acdbc8a691b656