Fix server version stringifying
Cleanup