Fix some client and server stuff