Fix broken repos and point to jmarcet forks