Handling default remotes better