Latest rollback changes

A few changes related to the rollback functionality.