Make entities/update more robust.