Fix class inspection
Fix savepoint management