Fixed some issues with new rollback system