Minor fixes to get remotes to show properly