Improve handling of remotes