Bug fix for Java/C client and MMServer.