Include fixes from David for Issue#166 (possible failed rollback)