Fix remotes and symlinks

Change-Id: Ib40ed7c37e431e167348d1ee85b7a83ab9f5af02