Bug fixes (WAMP issue #66).