fix some minor issues with remotes and addressing