client/server: various bug fixes