Fixed more issues with new rollback