client.c: Added amanda fixes.