Rollback and fixes