#220 : fix many problems due to poorly handled transactions, and intercept after OSIV...