Fix issues with fetching device repos