flake fixes and small url fix

Change-Id: I5e4e7c8e504059940eedbe33d0d9967f780f5a48