Correct a few minor url issues to skip 404s etc

Change-Id: I9891d02ef4cb38f49b3fd4bb112e9f9a1c577346