Same fixes as in the persistent module