Testing out fixing of remotes
Minor changes