Fix issues with the origin