X 931

Fixes for the rollback button