More attempts to avoid serializing Random