Fix memory exhaustion & client version