Fix debugging urls/branches

A few debugging urls/branches have remained; all changes are meged so
revert these to upstream