Rollbacks and further corrections