fixes for rollback review