test server and client tweaks to make building ok