Wrap up these changes i made a while ago to allow for proxying