Several fixes to avoid storing the source in the rupture