Fixes for reopening after an aborted commit