Rollback fixes