Fixes to COMMIT/ROLLBACK support