Large changes to handle inconsistencies with
proxy and remote