Remote url fixes

@cheister urgh you even called this out in your review, I guess I've forgotten how to code.