Fixing up some issues caused by the change in repo