Further fixes to use the proper repository ID